Author: clebert.suconic(a)jboss.com Date: 2011-09-19 19:47:54 -0400 (Mon, 19 Sep 2011) New Revision: 11370 Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/ClusterManager.java branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/Branch_2_2_EAP_cluster4/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java Log: Fixing tests Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/ClusterManager.java =================================================================== --- branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2011-09-19 21:54:41 UTC (rev 11369) +++ branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2011-09-19 23:47:54 UTC (rev 11370) @@ -52,7 +52,7 @@ void deploy() throws Exception; - void deployBridge(BridgeConfiguration config) throws Exception; + void deployBridge(BridgeConfiguration config, boolean start) throws Exception; void destroyBridge(String name) throws Exception; Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-09-19 21:54:41 UTC (rev 11369) +++ branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-09-19 23:47:54 UTC (rev 11370) @@ -211,18 +211,10 @@ for (BridgeConfiguration config : configuration.getBridgeConfigurations()) { - deployBridge(config); + deployBridge(config, !backup); } - for (Bridge bridge : bridges.values()) - { - if (!backup) - { - bridge.start(); - } - } - started = true; } @@ -379,7 +371,7 @@ this.clusterLocators.remove(serverLocator); } - public synchronized void deployBridge(final BridgeConfiguration config) throws Exception + public synchronized void deployBridge(final BridgeConfiguration config, final boolean start) throws Exception { if (config.getName() == null) { @@ -507,6 +499,11 @@ bridges.put(config.getName(), bridge); managementService.registerBridge(bridge, config); + + if (start) + { + bridge.start(); + } } Modified: branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-09-19 21:54:41 UTC (rev 11369) +++ branches/Branch_2_2_EAP_cluster4/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-09-19 23:47:54 UTC (rev 11370) @@ -1085,7 +1085,7 @@ { if (clusterManager != null) { - clusterManager.deployBridge(config); + clusterManager.deployBridge(config, true); } } Modified: branches/Branch_2_2_EAP_cluster4/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- branches/Branch_2_2_EAP_cluster4/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2011-09-19 21:54:41 UTC (rev 11369) +++ branches/Branch_2_2_EAP_cluster4/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2011-09-19 23:47:54 UTC (rev 11370) @@ -12,16 +12,9 @@ */ package org.hornetq.tests.integration.cluster.failover; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import junit.framework.Assert; - -import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; /** @@ -167,6 +160,7 @@ closeSessionFactory(0); Thread.sleep(1000); + servers[0].stop(true); waitForServerRestart(2); @@ -213,16 +207,4 @@ abstract boolean isSharedServer(); - private void fail(final RemotingConnection conn, final CountDownLatch latch) throws InterruptedException - { - // Simulate failure on connection - conn.fail(new HornetQException(HornetQException.NOT_CONNECTED)); - - // Wait to be informed of failure - - boolean ok = latch.await(1000, TimeUnit.MILLISECONDS); - - Assert.assertTrue(ok); - } - }