You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/07/23 14:58:54 UTC
svn commit: r797052 -
/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
Author: dejanb
Date: Thu Jul 23 12:58:53 2009
New Revision: 797052
URL: http://svn.apache.org/viewvc?rev=797052&view=rev
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-2069 - thread deadlock in endpoint worker
Modified:
activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java?rev=797052&r1=797051&r2=797052&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java Thu Jul 23 12:58:53 2009
@@ -247,15 +247,15 @@
public void stop() throws InterruptedException {
synchronized (shutdownMutex) {
if (!running)
- return;
- running = false;
+ return;
+ running = false;
LOG.info("Stopping");
// wake up pausing reconnect attempt
shutdownMutex.notifyAll();
- serverSessionPool.close();
+ serverSessionPool.close();
+ }
disconnect();
}
- }
private boolean isRunning() {
return running;