[hornetq-commits] JBoss hornetq SVN: r11267 - in branches/Branch_2_2_EAP_cluster_clean3: src/main/org/hornetq/core/settings and 2 other directories.

Author: clebert.suconic(a)jboss.com Date: 2011-08-31 22:59:35 -0400 (Wed, 31 Aug 2011) New Revision: 11267 Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/HierarchicalRepository.java branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java Log: fixing a test Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-08-31 23:07:45 UTC (rev 11266) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-09-01 02:59:35 UTC (rev 11267) @@ -862,7 +862,7 @@ nodeManager = null; - addressSettingsRepository.clear(); + addressSettingsRepository.clearListeners(); addressSettingsRepository.clearCache(); Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/HierarchicalRepository.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/HierarchicalRepository.java 2011-08-31 23:07:45 UTC (rev 11266) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/HierarchicalRepository.java 2011-09-01 02:59:35 UTC (rev 11267) @@ -65,6 +65,8 @@ */ void clear(); + void clearListeners(); + void clearCache(); int getCacheSize(); Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-08-31 23:07:45 UTC (rev 11266) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-09-01 02:59:35 UTC (rev 11267) @@ -221,6 +221,11 @@ matches.clear(); } + public void clearListeners() + { + listeners.clear(); + } + public void clearCache() { cache.clear(); Modified: branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java 2011-08-31 23:07:45 UTC (rev 11266) +++ branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java 2011-09-01 02:59:35 UTC (rev 11267) @@ -13,8 +13,6 @@ package org.hornetq.tests.integration.cluster.distribution; -import java.util.Map; - import org.hornetq.core.logging.Logger; /** @@ -130,7 +128,7 @@ stopServers(0, 1); } - public void testRestartTest() throws Throwable + public void testRestartServers() throws Throwable { String name = Thread.currentThread().getName(); try @@ -138,19 +136,18 @@ Thread.currentThread().setName("ThreadOnTestRestartTest"); startServers(0, 1); waitForTopology(servers[0], 2); - + System.out.println(servers[0].getClusterManager().getTopology().describe()); System.out.println(servers[1].getClusterManager().getTopology().describe()); waitForTopology(servers[1], 2); - for (int i = 0; i < 10; i++) { Thread.sleep(10); log.info("Sleep #test " + i); log.info("#stop #test #" + i); stopServers(1); - + System.out.println(servers[0].getClusterManager().getTopology().describe()); waitForTopology(servers[0], 1, 2000); log.info("#start #test #" + i); @@ -190,17 +187,17 @@ verifyNotReceive(0, 1); removeConsumer(1); - + closeSessionFactory(1); - + stopServers(1); - + Thread.sleep(12000); System.out.println(clusterDescription(servers[0])); startServers(1); - + Thread.sleep(3000); System.out.println(clusterDescription(servers[0]));