Author: jmesnil Date: 2010-08-13 11:01:21 -0400 (Fri, 13 Aug 2010) New Revision: 9541 Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java Log: clear the clusterConnections when the manager is stopped Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-08-13 13:45:27 UTC (rev 9540) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-08-13 15:01:21 UTC (rev 9541) @@ -192,13 +192,16 @@ managementService.unregisterBroadcastGroup(group.getName()); } + broadcastGroups.clear(); + for (ClusterConnection clusterConnection : clusterConnections.values()) { clusterConnection.stop(); managementService.unregisterCluster(clusterConnection.getName().toString()); } + + clusterConnections.clear(); - broadcastGroups.clear(); } for (Bridge bridge : bridges.values())