Repository: activemq Updated Branches: refs/heads/activemq-5.11.x ba512d95b -> 73a0caf75
https://issues.apache.org/jira/browse/AMQ-5605 Attempt to resolve high CPU usage after error by ensuring that the transport is disposed along with the fire of the local error. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/756fa656 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/756fa656 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/756fa656 Branch: refs/heads/activemq-5.11.x Commit: 756fa656b37df24bfe41679f8db238c021fe5f8b Parents: ba512d9 Author: Timothy Bish <[email protected]> Authored: Fri Aug 7 16:21:52 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Mon Oct 26 13:49:41 2015 -0400 ---------------------------------------------------------------------- .../apache/activemq/network/DemandForwardingBridgeSupport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/756fa656/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 83eea31..e4c1533 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 @@ -347,7 +347,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br try { remoteBrokerInfo = futureRemoteBrokerInfo.get(); if (remoteBrokerInfo == null) { - fireBridgeFailed(new Throwable("remoteBrokerInfo is null")); + serviceLocalException(new Throwable("remoteBrokerInfo is null")); return; } } catch (Exception e) { @@ -358,7 +358,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br try { localBrokerInfo = futureLocalBrokerInfo.get(); if (localBrokerInfo == null) { - fireBridgeFailed(new Throwable("localBrokerInfo is null")); + serviceLocalException(new Throwable("localBrokerInfo is null")); return; }
