[jboss-cvs] JBoss Messaging SVN: r6082 - in trunk: tests/src/org/jboss/messaging/tests/integration/jms/bridge and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-03-13 12:38:15 -0400 (Fri, 13 Mar 2009)
New Revision: 6082

Modified:
   trunk/src/main/org/jboss/messaging/jms/bridge/impl/BridgeImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
Log:
Bridge cleanup

in cleanup(), stop the source connection before delisting the resources and rolling back the tx so that no message will be received between the time the tx is rolled back and the connection is finally closed (connections must be closed after the tx is rolled back to let the XA packets reaches the source & targer servers)

Modified: trunk/src/main/org/jboss/messaging/jms/bridge/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/bridge/impl/BridgeImpl.java	2009-03-13 16:35:35 UTC (rev 6081)
+++ trunk/src/main/org/jboss/messaging/jms/bridge/impl/BridgeImpl.java	2009-03-13 16:38:15 UTC (rev 6082)
@@ -1001,6 +1001,16 @@
    
    private void cleanup()
    {
+      //Stop the source connection
+      try
+      {
+         sourceConn.stop();
+      }
+      catch (Throwable ignore)
+      {            
+         if (trace) { log.trace("Failed to stop source connection", ignore); }
+      }
+      
       if (tx != null)
       {
          try

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java	2009-03-13 16:35:35 UTC (rev 6081)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java	2009-03-13 16:38:15 UTC (rev 6082)
@@ -216,9 +216,9 @@
                                                DEFAULT_SEND_WINDOW_SIZE,
                                                DEFAULT_PRODUCER_MAX_RATE,
                                                DEFAULT_MIN_LARGE_MESSAGE_SIZE,
-                                               DEFAULT_BLOCK_ON_ACKNOWLEDGE,
                                                true,
                                                true,
+                                               true,
                                                DEFAULT_AUTO_GROUP,
                                                DEFAULT_MAX_CONNECTIONS,
                                                DEFAULT_PRE_ACKNOWLEDGE,                                                                
@@ -251,9 +251,9 @@
                                               DEFAULT_SEND_WINDOW_SIZE,
                                               DEFAULT_PRODUCER_MAX_RATE,
                                               DEFAULT_MIN_LARGE_MESSAGE_SIZE,
-                                              DEFAULT_BLOCK_ON_ACKNOWLEDGE,
                                               true,
                                               true,
+                                              true,
                                               DEFAULT_AUTO_GROUP,
                                               DEFAULT_MAX_CONNECTIONS,
                                               DEFAULT_PRE_ACKNOWLEDGE,