You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/11 17:22:39 UTC
[2/5] activemq-artemis git commit: ARTEMIS-179 Do not reconnect
bridge on DISCONNECT
ARTEMIS-179 Do not reconnect bridge on DISCONNECT
Note: this breaks scale-down because the bindings are removed.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/682cad63
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/682cad63
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/682cad63
Branch: refs/heads/master
Commit: 682cad63f3e5c8d59be92602de32e523aae032ca
Parents: f3be78a
Author: jbertram <jb...@apache.org>
Authored: Wed Aug 5 12:37:53 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Mon Aug 10 10:22:21 2015 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/server/cluster/impl/BridgeImpl.java | 3 +--
.../core/server/cluster/impl/ClusterConnectionBridge.java | 4 +++-
.../artemis/core/server/cluster/impl/ClusterConnectionImpl.java | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/682cad63/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 9853455..3ef7b24 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
@@ -587,8 +587,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
else {
ActiveMQServerLogger.LOGGER.debug("Received invalid scaleDownTargetNodeID: " + scaleDownTargetNodeID);
- //we never fail permanently here, this only happens once all reconnect tries have happened
- fail(false);
+ fail(me.getType() == ActiveMQExceptionType.DISCONNECTED);
}
tryScheduleRetryReconnect(me.getType());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/682cad63/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index c7e70c0..e336b33 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -340,7 +340,9 @@ public class ClusterConnectionBridge extends BridgeImpl {
@Override
protected void tryScheduleRetryReconnect(final ActiveMQExceptionType type) {
- scheduleRetryConnect();
+ if (type != ActiveMQExceptionType.DISCONNECTED) {
+ scheduleRetryConnect();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/682cad63/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index c4666b9..e42f46b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -1428,7 +1428,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
ActiveMQServerLogger.LOGGER.debug("Removing record for: " + targetNodeID);
MessageFlowRecord record = records.remove(targetNodeID);
try {
- record.close();
+ if (record != null) {
+ record.close();
+ }
}
catch (Exception e) {
e.printStackTrace();