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

[gtully]

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;