From 2350d8b764f03fc9a04e42dded258e70fa74f02e Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Thu, 23 Jul 2009 12:58:53 +0000
Subject: [PATCH] fix for https://issues.apache.org/activemq/browse/AMQ-2069 -
 thread deadlock in endpoint worker

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@797052 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/activemq/ra/ActiveMQEndpointWorker.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
index cea97d5861..1d6a7c2087 100755
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
@@ -247,15 +247,15 @@ public class ActiveMQEndpointWorker {
     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;