summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-08-09 12:33:23 +0000
committerGordon Sim <gsim@apache.org>2013-08-09 12:33:23 +0000
commitdea329a6277f8f68300809c64268edfcd0cd0fd7 (patch)
treec9900fffa9ac6537a09da59da30363169047cf00 /qpid/cpp/src
parentfdb6e755dadcfdc8f269fe24fe8cc8f646a15b05 (diff)
downloadqpid-python-dea329a6277f8f68300809c64268edfcd0cd0fd7.tar.gz
QPID-5053: release exclusive queue ownership when session ends (clear the set _after_ iterating over it!)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1512283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Session.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index cb154d6b70..cd1c21c40e 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
@@ -507,7 +507,6 @@ bool Session::dispatch()
void Session::close()
{
- exclusiveQueues.clear();
for (OutgoingLinks::iterator i = outgoing.begin(); i != outgoing.end(); ++i) {
i->second->detached();
}
@@ -520,6 +519,7 @@ void Session::close()
for (std::set< boost::shared_ptr<Queue> >::const_iterator i = exclusiveQueues.begin(); i != exclusiveQueues.end(); ++i) {
(*i)->releaseExclusiveOwnership();
}
+ exclusiveQueues.clear();
qpid::sys::Mutex::ScopedLock l(lock);
deleted = true;
}