activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-5605
Date Fri, 07 Aug 2015 20:22:20 GMT
Repository: activemq
Updated Branches:
  refs/heads/master b52796f79 -> a3c8bee1f


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/a3c8bee1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a3c8bee1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a3c8bee1

Branch: refs/heads/master
Commit: a3c8bee1f0696b1d0d9a315b12241eecbf1f2d85
Parents: b52796f
Author: Timothy Bish <tabish121@gmail.com>
Authored: Fri Aug 7 16:21:52 2015 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Fri Aug 7 16:21:52 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/a3c8bee1/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 8e08f95..ad6fd61 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,7 +348,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) {
@@ -359,7 +359,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;
             }
 


Mime
View raw message