From d03ba19ebcf9665a23ca4a80b862129861e2b08f Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 13 Jan 2012 16:20:11 +0000 Subject: QPID-3755 - Concurrent queue bind on the same queue results in crash git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1231158 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueueBindings.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/broker/QueueBindings.cpp') diff --git a/cpp/src/qpid/broker/QueueBindings.cpp b/cpp/src/qpid/broker/QueueBindings.cpp index 60d315acfe..c6b3ddf9a9 100644 --- a/cpp/src/qpid/broker/QueueBindings.cpp +++ b/cpp/src/qpid/broker/QueueBindings.cpp @@ -30,16 +30,22 @@ using namespace qpid::broker; void QueueBindings::add(const string& exchange, const string& key, const FieldTable& args) { + sys::Mutex::ScopedLock l(lock); bindings.push_back(QueueBinding(exchange, key, args)); } void QueueBindings::unbind(ExchangeRegistry& exchanges, Queue::shared_ptr queue) { - for (Bindings::iterator i = bindings.begin(); i != bindings.end(); i++) { + Bindings local; + { + sys::Mutex::ScopedLock l(lock); + local = bindings; + } + + for (Bindings::iterator i = local.begin(); i != local.end(); i++) try { exchanges.get(i->exchange)->unbind(queue, i->key, &(i->args)); } catch (const NotFoundException&) {} - } } QueueBinding::QueueBinding(const string& _exchange, const string& _key, const FieldTable& _args) -- cgit v1.2.1