Author: clebert.suconic(a)jboss.com Date: 2011-09-16 23:38:54 -0400 (Fri, 16 Sep 2011) New Revision: 11360 Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java Log: cluster cleanup Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-09-17 03:00:35 UTC (rev 11359) +++ branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-09-17 03:38:54 UTC (rev 11360) @@ -475,7 +475,6 @@ true, connector, null)); - backupSessionFactory.close(); log.info("backup announced"); } } @@ -1555,7 +1554,7 @@ { log.debug(ClusterConnectionImpl.this + "Creating a serverLocator for " + Arrays.toString(tcConfigs)); } - ServerLocatorImpl locator = new ServerLocatorImpl(includeTopology ? topology : null, true, tcConfigs); + ServerLocatorImpl locator = new ServerLocatorImpl(topology, true, tcConfigs); locator.setClusterConnection(true); return locator; } @@ -1587,7 +1586,7 @@ public ServerLocatorInternal createServerLocator(boolean includeTopology) { - ServerLocatorImpl locator = new ServerLocatorImpl(includeTopology ? topology : null, true, dg); + ServerLocatorImpl locator = new ServerLocatorImpl(topology, true, dg); return locator; }