geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r541134 - /geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
Date Thu, 24 May 2007 01:39:30 GMT
Author: dain
Date: Wed May 23 18:39:29 2007
New Revision: 541134

URL: http://svn.apache.org/viewvc?view=rev&rev=541134
Log:
Active transactions include those marked for rollback only

Modified:
    geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?view=diff&rev=541134&r1=541133&r2=541134
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
Wed May 23 18:39:29 2007
@@ -212,7 +212,7 @@
         if (tx == null) {
             throw new IllegalStateException("No tx on thread");
         }
-        if (tx.getStatus() != Status.STATUS_ACTIVE) {
+        if (tx.getStatus() != Status.STATUS_ACTIVE && tx.getStatus() != Status.STATUS_MARKED_ROLLBACK)
{
             throw new IllegalStateException("Transaction " + tx + " is not active");
         }
         return tx;



Mime
View raw message