From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Tue, 29 Jul 2008 13:51:43 +0000 (+0000)
Subject: detect error in Rollback and do not continue if occures
X-Git-Tag: merge_316_6_after~44
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d8be6b07ebd1a83478001ec0d7a5de5b3197ef32;p=jra1mw.git

detect error in Rollback and do not continue if occures
---

diff --git a/org.glite.lb.server/src/db_supp.c b/org.glite.lb.server/src/db_supp.c
index cf5817e..3577037 100644
--- a/org.glite.lb.server/src/db_supp.c
+++ b/org.glite.lb.server/src/db_supp.c
@@ -103,9 +103,8 @@ int edg_wll_TransNeedRetry(edg_wll_Context ctx) {
 		else 
 			syslog(LOG_INFO,"[%d]: DB deadlock detected. Rolling back transaction and retrying... \n",getpid());
 
-		edg_wll_Rollback(ctx);
 		edg_wll_ResetError(ctx);
-		return 1;
+		return !edg_wll_Rollback(ctx);
 	}
 	if (ret == EDG_WLL_ERROR_DB_LOST_CONNECTION) {
 		if (debug)
@@ -115,9 +114,8 @@ int edg_wll_TransNeedRetry(edg_wll_Context ctx) {
 			syslog(LOG_INFO,"[%d]: Lost connection to DB. "
 				"Rolling back transaction and retrying... \n",getpid());
 
-		edg_wll_Rollback(ctx);
 		edg_wll_ResetError(ctx);
-		return 1;
+		return !edg_wll_Rollback(ctx);
 	} else if (ret==0) {
 		edg_wll_Commit(ctx); /* errors propagated further */
 		return 0;