Repository: activemq Updated Branches: refs/heads/trunk 4a2af3ab0 -> c391321d1
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/c391321d Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c391321d Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c391321d Branch: refs/heads/trunk Commit: c391321d1b5b59542d847717654b0d4dba54cf2f Parents: 4a2af3a Author: Timothy Bish <[email protected]> Authored: Fri Aug 8 13:42:15 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri Aug 8 13:42:15 2014 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/network/DemandForwardingBridgeSupport.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/c391321d/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
