[hornetq-commits] JBoss hornetq SVN: r11248 - in branches/Branch_2_2_EAP_cluster_clean3: tests/src/org/hornetq/tests/integration/jms/bridge and 1 other directory.

Author: clebert.suconic(a)jboss.com Date: 2011-08-30 16:41:56 -0400 (Tue, 30 Aug 2011) New Revision: 11248 Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/client/impl/Topology.java branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java Log: tweaks to my branch Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/client/impl/Topology.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/client/impl/Topology.java 2011-08-30 19:54:15 UTC (rev 11247) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/client/impl/Topology.java 2011-08-30 20:41:56 UTC (rev 11248) @@ -179,14 +179,10 @@ { if (Topology.log.isDebugEnabled()) { - Topology.log.debug(this + "::NewMemeberAdd " + - this + - " MEMBER WAS NULL, Add member nodeId=" + + Topology.log.debug(this + "::NewMemeberAdd nodeId=" + nodeId + " member = " + - memberInput + - " size = " + - mapTopology.size(), new Exception("trace")); + memberInput, new Exception("trace")); } memberInput.setUniqueEventID(uniqueEventID); mapTopology.put(nodeId, memberInput); @@ -197,31 +193,30 @@ { if (uniqueEventID > currentMember.getUniqueEventID()) { - if (log.isDebugEnabled()) - { - log.debug(this + "::updated currentMember=nodeID=" + - nodeId + - currentMember + - " of memberInput=" + - memberInput); - } - TopologyMember newMember = new TopologyMember(currentMember.getA(), memberInput.getB()); - if (memberInput.getA() == null && memberInput.getB() != null) + if (newMember.getA() == null && currentMember.getA() != null) { - // Updating what appears to be a backup update newMember.setA(currentMember.getA()); } - else - if (currentMember.getA() == null && currentMember.getB() != null && newMember.getA() != null && newMember.getB() == null) + + if (newMember.getB() == null && currentMember.getB() != null) { - // This is a situation where we have: - // CurrentMember (null, X) && Input(X, null) - // This means the backup has arrived before, hence we need to merge the results - newMember.setA(currentMember.getA()); + newMember.setB(currentMember.getB()); } + if (log.isDebugEnabled()) + { + log.debug(this + "::updated currentMember=nodeID=" + + nodeId + + ", currentMember=" + + currentMember + + ", memberInput=" + + memberInput + + "newMember=" + newMember); + } + + newMember.setUniqueEventID(uniqueEventID); mapTopology.remove(nodeId); mapTopology.put(nodeId, newMember); Modified: branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2011-08-30 19:54:15 UTC (rev 11247) +++ branches/Branch_2_2_EAP_cluster_clean3/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2011-08-30 20:41:56 UTC (rev 11248) @@ -12,9 +12,6 @@ */ package org.hornetq.tests.integration.jms.bridge; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; - import junit.framework.Assert; import org.hornetq.core.logging.Logger; @@ -31,6 +28,11 @@ */ public class JMSBridgeReconnectionTest extends BridgeTestBase { + /** + * + */ + private static final int TIME_WAIT = 5000; + private static final Logger log = Logger.getLogger(JMSBridgeReconnectionTest.class); // Crash and reconnect @@ -175,8 +177,6 @@ bridge.stop(); Assert.assertFalse(bridge.isStarted()); - - // Thread.sleep(3000); // we restart and setup the server for the test's tearDown checks jmsServer1.start(); @@ -245,7 +245,7 @@ // Wait a while before starting up to simulate the dest being down for a while JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(10000); + Thread.sleep(TIME_WAIT); JMSBridgeReconnectionTest.log.info("Done wait"); // Restart the server @@ -337,7 +337,7 @@ // Wait a while before starting up to simulate the dest being down for a while JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(10000); + Thread.sleep(TIME_WAIT); JMSBridgeReconnectionTest.log.info("Done wait"); // Restart the server