ARTEMIS-1752 - avoid null pointer in BridgeImpl https://issues.apache.org/jira/browse/ARTEMIS-1752
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a1c76e8d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a1c76e8d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a1c76e8d Branch: refs/heads/master Commit: a1c76e8d61dc6ef0aed3126f529fa1403a582f85 Parents: d3b11bc Author: andytaylor <andy.tayl...@gmail.com> Authored: Mon Mar 19 08:36:38 2018 +0000 Committer: Martyn Taylor <mtay...@redhat.com> Committed: Thu Mar 22 11:01:32 2018 +0000 ---------------------------------------------------------------------- .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a1c76e8d/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 1c4038b..a83e91b 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 @@ -775,7 +775,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled protected void fail(final boolean permanently) { logger.debug(this + "\n\t::fail being called, permanently=" + permanently); //we need to make sure we remove the node from the topology so any incoming quorum requests are voted correctly - serverLocator.notifyNodeDown(System.currentTimeMillis(), targetNodeID); + if (targetNodeID != null) { + serverLocator.notifyNodeDown(System.currentTimeMillis(), targetNodeID); + } if (queue != null) { try { if (logger.isTraceEnabled()) {
