[hornetq-commits] JBoss hornetq SVN: r11132 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-08-05 00:43:33 -0400 (Fri, 05 Aug 2011)
New Revision: 11132

Modified:
   branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
Log:
tweak

Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java	2011-08-05 04:22:43 UTC (rev 11131)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java	2011-08-05 04:43:33 UTC (rev 11132)
@@ -800,15 +800,16 @@
 //                           
 //            }
 
-            session.removeFailureListener(BridgeImpl.this);
+            if (session != null)
+            {
+               session.removeFailureListener(BridgeImpl.this);
+            }
 
             if (csf != null)
             {
                csf.cleanup();
             }
 
-            serverLocator.close();
-
             synchronized (BridgeImpl.this)
             {
                log.debug("Closing Session for bridge " + BridgeImpl.this.name);