[hornetq-commits] JBoss hornetq SVN: r9721 - in branches/2_2_0_HA_Improvements: src/main/org/hornetq/core/protocol/core and 13 other directories.

Author: ataylor Date: 2010-09-24 03:35:56 -0400 (Fri, 24 Sep 2010) New Revision: 9721 Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/remoting/FailureListener.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/client/HornetQConnection.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/SessionTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/PingTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java Log: changed failover listener to add flag to indicate if failover has occured Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -469,7 +469,7 @@ } // We call before reconnection occurs to give the user a chance to do cleanup, like cancel messages - callFailureListeners(me, false); + callFailureListeners(me, false, false); // Now get locks on all channel 1s, whilst holding the failoverLock - this makes sure // There are either no threads executing in createSession, or one is blocking on a createSession @@ -599,7 +599,7 @@ connection = null; } - callFailureListeners(me, true); + callFailureListeners(me, true, connection != null); if (connection == null) { @@ -798,7 +798,7 @@ throw new IllegalStateException("Oh my God it's full of stars!"); } - private void callFailureListeners(final HornetQException me, final boolean afterReconnect) + private void callFailureListeners(final HornetQException me, final boolean afterReconnect, boolean failedOver) { final List<SessionFailureListener> listenersClone = new ArrayList<SessionFailureListener>(listeners); @@ -808,7 +808,7 @@ { if (afterReconnect) { - listener.connectionFailed(me); + listener.connectionFailed(me, failedOver); } else { @@ -1205,7 +1205,7 @@ this.connectionID = connectionID; } - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { handleConnectionFailure(connectionID, me); } Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -1480,7 +1480,7 @@ // FailureListener implementation -------------------------------------------- - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { try { Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -159,7 +159,7 @@ return channel.getID(); } - public void connectionFailed(final HornetQException exception) + public void connectionFailed(final HornetQException exception, boolean failedOver) { log.warn("Client connection failed, clearing up resources for session " + session.getName()); Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -113,6 +113,13 @@ { public void nodeUP(String nodeID, String sourceNodeID, Pair<TransportConfiguration, TransportConfiguration> connectorPair, boolean last, int distance) { + if(System.getProperty("foo") != null) + { + if(connectorPair.toString().contains("b=org-hornetq-core-remoting-impl-invm-InVMConnectorFactory?server-id=1")) + { + System.out.println(""); + } + } channel0.send(new ClusterTopologyChangeMessage(nodeID, sourceNodeID, connectorPair, last, distance + 1)); } Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -30,7 +30,6 @@ import org.hornetq.core.protocol.core.Channel; import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.FailureListener; @@ -489,7 +488,7 @@ { try { - listener.connectionFailed(me); + listener.connectionFailed(me, false); } catch (final Throwable t) { Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -53,6 +53,14 @@ this.backup = backup; this.connector = tc; + if(System.getProperty("foo") != null) + { + if(tc.toString().contains("org-hornetq-core-remoting-impl-invm-InVMConnectorFactory?server-id=1")) + { + System.out.println(""); + } + } + } public NodeAnnounceMessage() Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/remoting/FailureListener.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/remoting/FailureListener.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/remoting/FailureListener.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -27,6 +27,7 @@ * Notifies that a connection has failed due to the specified exception. * * @param exception exception which has caused the connection to fail + * @param failedOver */ - void connectionFailed(HornetQException exception); + void connectionFailed(HornetQException exception, boolean failedOver); } Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -327,7 +327,7 @@ failureListener = new SessionFailureListener() { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { if (me.getCode() == HornetQException.DISCONNECTED) { Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -25,7 +25,6 @@ import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.ServerLocator; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -388,7 +387,7 @@ // FailureListener implementation -------------------------------- - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { fail(false); } Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -229,9 +229,9 @@ } @Override - public void connectionFailed(HornetQException me) + public void connectionFailed(HornetQException me, boolean failedOver) { - if (!session.isClosed()) + if (!failedOver && !session.isClosed()) { try { @@ -242,37 +242,7 @@ log.warn("Unable to clean up the session after a connection failure", e); } serverLocator.notifyNodeDown(targetNodeID); - if (serverLocator.getDiscoveryAddress() == null) - { - executor.execute(new Runnable() - { - - public void run() - { - ClientSessionFactory sf = null; - do - { - try - { - sf = serverLocator.createSessionFactory(connector); - } - catch (HornetQException e) - { - if (e.getCode() == HornetQException.NOT_CONNECTED) - { - continue; - } - } - catch (Exception e) - { - break; - } - } - while (sf == null); - } - }); - } } - super.connectionFailed(me); + super.connectionFailed(me, failedOver); } } Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -398,7 +398,7 @@ } } - public void connectionFailed(HornetQException exception) + public void connectionFailed(HornetQException exception, boolean failedOver) { run(); } @@ -1059,7 +1059,7 @@ // FailureListener implementation // -------------------------------------------------------------------- - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { try { Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/client/HornetQConnection.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -583,7 +583,7 @@ connectionRef = new WeakReference<HornetQConnection>(connection); } - public synchronized void connectionFailed(final HornetQException me) + public synchronized void connectionFailed(final HornetQException me, boolean failedOver) { if (me == null) { Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -216,7 +216,7 @@ } } - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { HornetQXAResourceWrapper.log.warn("Notified of connection failure in recovery connectionFactory for provider " + connectorFactoryClassName, me); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/SessionTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -67,7 +67,7 @@ final CountDownLatch latch = new CountDownLatch(1); clientSession.addFailureListener(new SessionFailureListener() { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } @@ -106,7 +106,7 @@ { boolean called = false; - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { called = true; } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import junit.framework.Assert; @@ -54,7 +53,7 @@ { CountDownLatch latch = new CountDownLatch(1); - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -84,7 +84,7 @@ class MyListener implements FailureListener { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } @@ -182,7 +182,7 @@ class MyListener implements FailureListener { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -89,7 +89,7 @@ ClientSessionFactoryInternal sf2 = createSessionFactoryAndWaitForTopology(locator2, 4); ClientSession session2 = sendAndConsume(sf2, true); - + System.setProperty("foo", "bar"); servers.get(3).crash(session2); int liveAfter3 = waitForBackup(10000, servers, 4, 5); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -235,7 +235,7 @@ class MyListener implements SessionFailureListener { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -254,7 +254,7 @@ { volatile boolean failed; - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { failed = true; } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -102,7 +102,7 @@ class MyListener implements SessionFailureListener { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -14,7 +14,6 @@ package org.hornetq.tests.integration.cluster.util; import java.io.File; -import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -24,16 +23,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.client.impl.DelegatingSession; import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.ClusterManager; import org.hornetq.core.server.cluster.impl.ClusterManagerImpl; -import org.hornetq.core.server.cluster.impl.FakeLockFile; import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; /** * A SameProcessHornetQServer @@ -78,7 +70,7 @@ class MyListener implements SessionFailureListener { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { latch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -82,7 +82,7 @@ { volatile HornetQException me; - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { this.me = me; } @@ -325,7 +325,7 @@ final CountDownLatch clientLatch = new CountDownLatch(1); SessionFailureListener clientListener = new SessionFailureListener() { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { clientLatch.countDown(); } Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java 2010-09-22 22:16:06 UTC (rev 9720) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java 2010-09-24 07:35:56 UTC (rev 9721) @@ -90,7 +90,7 @@ session.addFailureListener(new SessionFailureListener() { - public void connectionFailed(final HornetQException me) + public void connectionFailed(final HornetQException me, boolean failedOver) { count.incrementAndGet(); latch.countDown();