Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 58496 invoked from network); 14 Jan 2009 13:46:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2009 13:46:12 -0000 Received: (qmail 92118 invoked by uid 500); 14 Jan 2009 13:46:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 92095 invoked by uid 500); 14 Jan 2009 13:46:12 -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 92085 invoked by uid 99); 14 Jan 2009 13:46:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2009 05:46:12 -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; Wed, 14 Jan 2009 13:46:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1E9FC23888AF; Wed, 14 Jan 2009 05:45:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r734393 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ActiveMQSession.java test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java Date: Wed, 14 Jan 2009 13:45:38 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090114134549.1E9FC23888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Wed Jan 14 05:45:17 2009 New Revision: 734393 URL: http://svn.apache.org/viewvc?rev=734393&view=rev Log: resolve unit test failures from changes via: https://issues.apache.org/activemq/browse/AMQ-2034 - only use sync for close if in xa tx, this may need some rework for managed tck case Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=734393&r1=734392&r2=734393&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Wed Jan 14 05:45:17 2009 @@ -554,7 +554,7 @@ */ public void close() throws JMSException { if (!closed) { - if (getTransacted()) { + if (getTransactionContext().isInXATransaction()) { if (!synchronizationRegistered) { synchronizationRegistered = true; getTransactionContext().addSynchronization(new Synchronization() { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java?rev=734393&r1=734392&r2=734393&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java Wed Jan 14 05:45:17 2009 @@ -23,7 +23,7 @@ import org.apache.activemq.test.JmsResourceProvider; /** - * Test failover for Queues + * Test failover for Topics */ public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest { protected BrokerService slave;