https://issues.apache.org/jira/browse/AMQ-5315
Fix for potential NPE on transport error. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5c3a2db3 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5c3a2db3 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5c3a2db3 Branch: refs/heads/activemq-5.10.x Commit: 5c3a2db3ff528eab33ef7a914a990a8e6156ae20 Parents: f436b33 Author: Timothy Bish <[email protected]> Authored: Fri Aug 8 13:42:15 2014 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Dec 17 19:27:45 2014 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/network/DemandForwardingBridgeSupport.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5c3a2db3/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java index 3a6f88e..2242d73 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java +++ b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java @@ -348,6 +348,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br remoteBrokerInfo = futureRemoteBrokerInfo.get(); if (remoteBrokerInfo == null) { fireBridgeFailed(); + return; } } catch (Exception e) { serviceRemoteException(e); @@ -358,6 +359,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br localBrokerInfo = futureLocalBrokerInfo.get(); if (localBrokerInfo == null) { fireBridgeFailed(); + return; } // Before we try and build the bridge lets check if we are in a loop
