From 3bb88c60ca683f5ff6788c0c5758a96210e346b5 Mon Sep 17 00:00:00 2001 From: jbertram Date: Thu, 6 Aug 2015 16:28:56 -0500 Subject: [PATCH] ARTEMIS-179 fix scale-down --- .../artemis/core/client/impl/ClientSessionFactoryImpl.java | 2 +- .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index aa27581e87..acdf1e8e35 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -579,7 +579,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C sessionsToClose = new HashSet(sessions); } callFailoverListeners(FailoverEventType.FAILOVER_FAILED); - callSessionFailureListeners(me, true, false); + callSessionFailureListeners(me, true, false, scaleDownTargetNodeID); } } finally { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java index 3ef7b24c78..eb99fcc99d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java @@ -565,7 +565,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled catch (Throwable dontCare) { } - if (scaleDownTargetNodeID != null && !scaleDownTargetNodeID.equals(nodeUUID)) { + if (scaleDownTargetNodeID != null && !scaleDownTargetNodeID.equals(nodeUUID.toString())) { synchronized (this) { try { ActiveMQServerLogger.LOGGER.debug("Moving " + queue.getMessageCount() + " messages from " + queue.getName() + " to " + scaleDownTargetNodeID);