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-3887 - do safeWaitUntilStarted outside of the synchronized block as deadlocks are possible 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390473 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2012-09-26 13:29:16 +00:00
parent effc8b9b89
commit f49675bfa2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -273,14 +273,14 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
} }
startedLatch.countDown(); startedLatch.countDown();
localStartedLatch.countDown(); localStartedLatch.countDown();
}
safeWaitUntilStarted(); safeWaitUntilStarted();
if (!disposed.get()) { if (!disposed.get()) {
setupStaticDestinations(); setupStaticDestinations();
} else { } else {
LOG.warn("Network connection between " + localBroker + " and " + remoteBroker + "(" + remoteBrokerName + ") was interrupted during establishment."); LOG.warn("Network connection between " + localBroker + " and " + remoteBroker + "(" + remoteBrokerName + ") was interrupted during establishment.");
}
} }
} }
} }