QPID-5571 : Java Broker AMQP 1.0 deadlock on close consumer

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1570245 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
index 317e184dae..fb4740dd4a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
@@ -96,7 +96,6 @@ public class QueueRunner implements Runnable
             }
             finally
             {
-                CurrentActor.remove();
                 _scheduled.compareAndSet(RUNNING, IDLE);
                 final long stateChangeCount = _queue.getStateChangeCount();
                 _lastRunAgain.set(runAgain);
@@ -108,6 +107,7 @@ public class QueueRunner implements Runnable
                         _queue.execute(this);
                     }
                 }
+                CurrentActor.remove();
             }
 
         }