Author: clebert.suconic(a)jboss.com Date: 2011-07-06 16:07:47 -0400 (Wed, 06 Jul 2011) New Revision: 10939 Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java Log: trying to fix more tests Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-07-06 19:32:56 UTC (rev 10938) +++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-07-06 20:07:47 UTC (rev 10939) @@ -516,7 +516,7 @@ // FailureListener implementation -------------------------------- - public final void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final HornetQException me, boolean failedOver) { log.warn(this + "::Connection failed with failedOver=" + failedOver + "-" + me, me); @@ -544,8 +544,9 @@ else { fail(false); - scheduleRetryConnect(); } + + scheduleRetryConnect(); } public void beforeReconnect(final HornetQException exception) Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2011-07-06 19:32:56 UTC (rev 10938) +++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2011-07-06 20:07:47 UTC (rev 10939) @@ -138,7 +138,41 @@ log.debug("Setting up bridge between " + clusterConnection.getConnector() + " and " + targetLocator, new Exception ("trace")); } } + + public void connectionFailed(final HornetQException me, boolean failedOver) + { + + log.warn(this + "::Connection failed with failedOver=" + failedOver + "-" + me, me); + + try + { + // csf.cleanup(); + } + catch (Throwable dontCare) + { + } + try + { + // session.cleanUp(false); + } + catch (Throwable dontCare) + { + } + + if (me.getCode() == HornetQException.DISCONNECTED) + { + fail(true); + } + else + { + fail(false); + scheduleRetryConnect(); + } + } + + + @Override protected ServerMessage beforeForward(ServerMessage message) {