Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 2177 invoked from network); 24 May 2007 01:39:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 May 2007 01:39:51 -0000 Received: (qmail 59140 invoked by uid 500); 24 May 2007 01:39:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59132 invoked by uid 500); 24 May 2007 01:39:56 -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 59119 invoked by uid 99); 24 May 2007 01:39:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2007 18:39:56 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2007 18:39:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 217A01A981A; Wed, 23 May 2007 18:39:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070524013930.217A01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;