Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 11230 invoked from network); 7 Sep 2005 23:56:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Sep 2005 23:56:07 -0000 Received: (qmail 3043 invoked by uid 500); 7 Sep 2005 23:56:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2894 invoked by uid 500); 7 Sep 2005 23:56:05 -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 2880 invoked by uid 99); 7 Sep 2005 23:56:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Sep 2005 16:56:05 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 07 Sep 2005 16:56:18 -0700 Received: (qmail 11201 invoked by uid 65534); 7 Sep 2005 23:56:04 -0000 Message-ID: <20050907235604.11200.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r279468 - in /geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction: context/InheritableTransactionContext.java manager/TransactionImpl.java Date: Wed, 07 Sep 2005 23:56:04 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Wed Sep 7 16:56:01 2005 New Revision: 279468 URL: http://svn.apache.org/viewcvs?rev=279468&view=rev Log: If end fails, mark the transaction rollback only. Improve error message slightly Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/InheritableTransactionContext.java geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/InheritableTransactionContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/InheritableTransactionContext.java?rev=279468&r1=279467&r2=279468&view=diff ============================================================================== --- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/InheritableTransactionContext.java (original) +++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/InheritableTransactionContext.java Wed Sep 7 16:56:01 2005 @@ -96,8 +96,11 @@ if (transaction == null) { throw new IllegalStateException("There is no transaction in progress."); } - - return transaction.delistResource(xaResource, flag); + boolean success = transaction.delistResource(xaResource, flag); + if (!success) { + transaction.setRollbackOnly(); + } + return success; } public void registerSynchronization(Synchronization synchronization) throws RollbackException, SystemException { Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=279468&r1=279467&r2=279468&view=diff ============================================================================== --- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original) +++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Wed Sep 7 16:56:01 2005 @@ -212,7 +212,7 @@ } return true; } catch (XAException e) { - log.warn("Unable to delist XAResource " + xaRes, e); + log.warn("Unable to delist XAResource " + xaRes + ", error code: " + e.errorCode, e); return false; } }