activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [3/5] activemq-artemis git commit: ARTEMIS-179 fix scale-down
Date Tue, 11 Aug 2015 15:22:40 GMT
ARTEMIS-179 fix scale-down


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3bb88c60
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3bb88c60
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3bb88c60

Branch: refs/heads/master
Commit: 3bb88c60ca683f5ff6788c0c5758a96210e346b5
Parents: 682cad6
Author: jbertram <jbertram@apache.org>
Authored: Thu Aug 6 16:28:56 2015 -0500
Committer: jbertram <jbertram@apache.org>
Committed: Mon Aug 10 10:23:30 2015 -0500

----------------------------------------------------------------------
 .../artemis/core/client/impl/ClientSessionFactoryImpl.java         | 2 +-
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3bb88c60/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
----------------------------------------------------------------------
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 aa27581..acdf1e8 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<ClientSessionInternal>(sessions);
             }
             callFailoverListeners(FailoverEventType.FAILOVER_FAILED);
-            callSessionFailureListeners(me, true, false);
+            callSessionFailureListeners(me, true, false, scaleDownTargetNodeID);
          }
       }
       finally {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3bb88c60/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
----------------------------------------------------------------------
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 3ef7b24..eb99fcc 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);


Mime
View raw message