diff options
| author | Gordon Sim <gsim@apache.org> | 2014-01-10 23:12:33 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-01-10 23:12:33 +0000 |
| commit | e1c5bc1c7fe6a89626f76428434839474e2b7482 (patch) | |
| tree | 048396f962931045c2ba6296903e1dc16c18f1c6 /cpp/src | |
| parent | 767ae0ede9dfae76435a7cf1d4b929bfcb550915 (diff) | |
| download | qpid-python-e1c5bc1c7fe6a89626f76428434839474e2b7482.tar.gz | |
QPID-5468: fix handling of delete-if-unused for sending links
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1557279 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 74d23fdabf..2c8f8c2f0e 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/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) |