Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Timothy Bish 2015-08-07 16:21:52 -04:00
parent b52796f794
commit a3c8bee1f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -348,7 +348,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
try { try {
remoteBrokerInfo = futureRemoteBrokerInfo.get(); remoteBrokerInfo = futureRemoteBrokerInfo.get();
if (remoteBrokerInfo == null) { if (remoteBrokerInfo == null) {
fireBridgeFailed(new Throwable("remoteBrokerInfo is null")); serviceLocalException(new Throwable("remoteBrokerInfo is null"));
return; return;
} }
} catch (Exception e) { } catch (Exception e) {
@ -359,7 +359,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
try { try {
localBrokerInfo = futureLocalBrokerInfo.get(); localBrokerInfo = futureLocalBrokerInfo.get();
if (localBrokerInfo == null) { if (localBrokerInfo == null) {
fireBridgeFailed(new Throwable("localBrokerInfo is null")); serviceLocalException(new Throwable("localBrokerInfo is null"));
return; return;
} }