geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r737084 - /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Date Fri, 23 Jan 2009 16:46:23 GMT
Author: linsun
Date: Fri Jan 23 08:46:23 2009
New Revision: 737084

URL: http://svn.apache.org/viewvc?rev=737084&view=rev
Log:
revert rev 735100 in branch 2.1 see comments on GERONIMO-4519

Modified:
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=737084&r1=737083&r2=737084&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Fri Jan 23 08:46:23 2009
@@ -475,10 +475,10 @@
                 default:
                     throw new IllegalStateException("Status is " + getStateString(status));
             }
+            rms = resourceManagers;
         }
 
         endResources();
-        rms = resourceManagers;
         try {
             rollbackResources(rms);
             //only write rollback record if we have already written prepare record.
@@ -573,11 +573,6 @@
                 log.warn("Error ending association for XAResource " + xaRes + "; transaction
will roll back. XA error code: " + e.errorCode, e);
                 synchronized (this) {
                     status = Status.STATUS_MARKED_ROLLBACK;
-                    // when XAException is XA_RBROLLBACK, which indicates that XAResource
has already rolled back the transaction, no need
-                    // to send rollback request to the XAResource, thus remove it off resourceManagers
list.
-                    if (e.errorCode == XAException.XA_RBROLLBACK) {
-                        resourceManagers.remove(manager);
-                    }
                 }
             }
         }



Mime
View raw message