[jboss-cvs] JBoss Messaging SVN: r7913 - branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/tx.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-12-01 08:32:42 -0500 (Tue, 01 Dec 2009)
New Revision: 7913

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/tx/TransactionRepository.java
Log:
JBMESSAGING-1772


Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/tx/TransactionRepository.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/tx/TransactionRepository.java	2009-12-01 13:19:40 UTC (rev 7912)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/tx/TransactionRepository.java	2009-12-01 13:32:42 UTC (rev 7913)
@@ -525,8 +525,12 @@
          Transaction tx = (Transaction)itv.next();
          try
          {
-            tx.commit();
-            result = true;
+            if (tx.getId() == txid)
+            {
+               tx.commit();
+               result = true;
+               break;
+            }
          }
          catch (Exception e)
          {
@@ -548,8 +552,12 @@
          Transaction tx = (Transaction)itv.next();
          try
          {
-            tx.rollback();
-            result = true;
+            if (tx.getId() == txid)
+            {
+               tx.rollback();
+               result = true;
+               break;
+            }
          }
          catch (Exception e)
          {