Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 70536 invoked from network); 23 Jan 2009 16:46:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jan 2009 16:46:47 -0000 Received: (qmail 28240 invoked by uid 500); 23 Jan 2009 16:46:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 28203 invoked by uid 500); 23 Jan 2009 16:46:46 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 28194 invoked by uid 99); 23 Jan 2009 16:46:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2009 08:46:46 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2009 16:46:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E12F82388AFC; Fri, 23 Jan 2009 08:46:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: linsun@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090123164623.E12F82388AFC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); - } } } }