From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Thu, 28 Feb 2008 17:15:55 +0000 (+0000)
Subject: merge two transactions into one bigger
X-Git-Tag: merge_transactions_src~18
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=de3c4d4c036fa55ec08918c812468b89dceb3328;p=jra1mw.git

merge two transactions into one bigger
---

diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c
index d450188..ed8f042 100644
--- a/org.glite.lb.server/src/db_store.c
+++ b/org.glite.lb.server/src/db_store.c
@@ -92,15 +92,6 @@ db_store(edg_wll_Context ctx, char *event)
 			if (edg_wll_PurgeServerProxy(ctx, ev->any.jobId)) goto rollback;
 	}
 
-commit:
-rollback:;
-  } while (edg_wll_TransNeedRetry(ctx));
-	
-  if (edg_wll_Error(ctx, NULL, NULL)) goto err;
-
-
-  do {
-	if (edg_wll_Transaction(ctx)) goto err;
 
 	if (ev->any.type == EDG_WLL_EVENT_REGJOB &&
 		(ev->regJob.jobtype == EDG_WLL_REGJOB_DAG ||
@@ -108,9 +99,10 @@ rollback:;
 		 ev->regJob.jobtype == EDG_WLL_REGJOB_COLLECTION) &&
 		ev->regJob.nsubjobs > 0)  
 
-			if (register_subjobs_embryonic(ctx,&ev->regJob)) goto rollback2;
+			if (register_subjobs_embryonic(ctx,&ev->regJob)) goto rollback;
 
-rollback2:;
+commit:
+rollback:;
   } while (edg_wll_TransNeedRetry(ctx));
 
   if (edg_wll_Error(ctx, NULL, NULL)) goto err;