[hornetq-commits] JBoss hornetq SVN: r10828 - 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-06-16 21:51:33 -0400 (Thu, 16 Jun 2011)
New Revision: 10828

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

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-06-17 01:50:19 UTC (rev 10827)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java	2011-06-17 01:51:33 UTC (rev 10828)
@@ -771,10 +771,12 @@
          {
          }
       }
+      
+      if (log.isDebugEnabled())
+      {
+         log.debug("Scheduling retry for bridge " + this.name + "in " + milliseconds + " milliseconds");
+      }
 
-      csf = null;
-      session = null;
-
       futureScheduledReconnection = scheduledExecutor.schedule(new FutureConnectRunnable(), milliseconds, TimeUnit.MILLISECONDS);
    }
 
@@ -795,7 +797,7 @@
 
             if (csf != null)
             {
-               csf.close();
+               csf.cleanup();
             }
 
             synchronized (BridgeImpl.this)
@@ -810,6 +812,8 @@
 
             queue.removeConsumer(BridgeImpl.this);
 
+            internalCancelReferences();
+
             log.info("stopped bridge " + name);
          }
          catch (Exception e)