CVS update of sequoia/src/org/continuent/sequoia/controller/requestmanager (1 file)

    Date: Thursday, October 27, 2005 @ 16:09:55
  Author: mathieu
    Path: .../sequoia/src/org/continuent/sequoia/controller/requestmanager

Modified: RequestManager.java (1.27 -> 1.28)

Fixed empty transaction commit so that commit is not scheduled and thus not 
inserted in the total order queue


---------------------+
 RequestManager.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)


Index: 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.27
 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.28
--- 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.27
       Thu Oct 27 11:14:00 2005
+++ 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java
    Thu Oct 27 16:09:55 2005
@@ -1366,17 +1366,20 @@
     {
       Long tid = new Long(transactionId);
       TransactionMetaData tm = getTransactionMetaData(tid);
-
-      // Wait for the scheduler to give us the authorization to execute
-      scheduler.commit(tm);
-
-      if (logger.isDebugEnabled())
-        logger.debug(Translate.get("transaction.commit", String.valueOf(tid)));
+      boolean commitScheduled = false;
 
       try
       {
         if (!emptyTransaction)
         {
+          // Wait for the scheduler to give us the authorization to execute
+          scheduler.commit(tm);
+          commitScheduled = true;
+
+          if (logger.isDebugEnabled())
+            logger.debug(Translate.get("transaction.commit", String
+                .valueOf(tid)));
+
           // Send to load balancer
           loadBalancer.commit(tm);
 
@@ -1402,8 +1405,11 @@
       }
       finally
       {
-        // Notify scheduler for completion
-        scheduler.commitCompleted(transactionId);
+        if (commitScheduled)
+        {
+          // Notify scheduler for completion
+          scheduler.commitCompleted(transactionId);
+        }
 
         completeTransaction(tid);
       }