QPID-5793: prevent deadlock between timer and consume

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

1 files changed, 3 insertions, 1 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 78ee37607e..e91123eb6a 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -540,6 +540,7 @@ void Queue::consume(Consumer::shared_ptr c, bool requestExclusive,
                     const framing::FieldTable& arguments,
                     const std::string& connectionId, const std::string& userId)
 {
+    boost::intrusive_ptr<qpid::sys::TimerTask> t;
     {
         Mutex::ScopedLock locker(messageLock);
         if (c->preAcquires()) {
@@ -568,12 +569,13 @@ void Queue::consume(Consumer::shared_ptr c, bool requestExclusive,
         if(c->isCounted()) {
             //reset auto deletion timer if necessary
             if (settings.autoDeleteDelay && autoDeleteTask) {
-                autoDeleteTask->cancel();
+                t = autoDeleteTask;
             }
 
             observeConsumerAdd(*c, locker);
         }
     }
+    if (t) t->cancel();
     if (mgmtObject != 0 && c->isCounted()) {
         mgmtObject->inc_consumerCount();
     }