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

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2012-03-01 15:08:46 -0500 (Thu, 01 Mar 2012)
New Revision: 12228

Modified:
   branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
JBPAPP-8174 - duh

Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2012-03-01 19:59:23 UTC (rev 12227)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2012-03-01 20:08:46 UTC (rev 12228)
@@ -531,7 +531,10 @@
          }
       }
 
-      bridge.flushExecutor();
+      if (bridge!= null)
+      {
+         bridge.flushExecutor();
+      }
    }
 
    // for testing