From 348b3e48dcf25a61c16915ebc7a8649f9c84b65e Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Fri, 10 Jan 2014 23:12:33 +0000
Subject: QPID-5468: fix handling of delete-if-unused for sending links

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557279 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/Queue.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 74d23fdabf..2c8f8c2f0e 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -521,16 +521,17 @@ void Queue::markInUse(bool controlling)
 
 void Queue::releaseFromUse(bool controlling)
 {
+    bool trydelete;
     if (controlling) {
-        {
-            Mutex::ScopedLock locker(messageLock);
-            users.removeLifecycleController();
-        }
-        scheduleAutoDelete();
+        Mutex::ScopedLock locker(messageLock);
+        users.removeLifecycleController();
+        trydelete = true;
     } else {
         Mutex::ScopedLock locker(messageLock);
         users.removeOther();
+        trydelete = isUnused(locker);
     }
+    if (trydelete) scheduleAutoDelete();
 }
 
 void Queue::consume(Consumer::shared_ptr c, bool requestExclusive)
-- 
cgit v1.2.1