Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 75429 invoked from network); 6 Feb 2009 17:28:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Feb 2009 17:28:35 -0000 Received: (qmail 34018 invoked by uid 500); 6 Feb 2009 17:28:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 34005 invoked by uid 500); 6 Feb 2009 17:28:35 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 33996 invoked by uid 99); 6 Feb 2009 17:28:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 09:28:34 -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, 06 Feb 2009 17:28:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EA9372388AE9; Fri, 6 Feb 2009 17:28:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r741646 - /activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java Date: Fri, 06 Feb 2009 17:28:13 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090206172813.EA9372388AE9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Fri Feb 6 17:28:13 2009 New Revision: 741646 URL: http://svn.apache.org/viewvc?rev=741646&view=rev Log: resolve unit test break, check for tx need to be overridden to take care of shared case Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java?rev=741646&r1=741645&r2=741646&view=diff ============================================================================== --- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java (original) +++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java Fri Feb 6 17:28:13 2009 @@ -121,6 +121,11 @@ } } + @Override + public boolean isInTransaction() { + return isInXATransaction() || isInLocalTransaction(); + } + public boolean isSameRM(XAResource xaResource) throws XAException { if (useSharedTxContext) { return sharedContext.isSameRM(xaResource);