summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-06-09 12:42:50 +0000
committerGordon Sim <gsim@apache.org>2009-06-09 12:42:50 +0000
commitac4120812fc15e3e64955f9427fd81c31bc39b55 (patch)
treea4d417731add96a58548927bfe37eafd2d85592b /cpp/src
parent32b336a86da538c8214c3587628acc99840e919b (diff)
downloadqpid-python-ac4120812fc15e3e64955f9427fd81c31bc39b55.tar.gz
Lock should be released in LVQ before dequeuing old message to prevent possible deadlocks when a store plugin is loaded.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@782979 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Queue.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index dff28f189e..e5bcf9ef57 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -577,6 +577,7 @@ void Queue::push(boost::intrusive_ptr<Message>& msg, bool isRecovery){
//recovery is complete
pendingDequeues.push_back(QueuedMessage(qm.queue, old, qm.position));
} else {
+ Mutex::ScopedUnlock u(messageLock);
dequeue(0, QueuedMessage(qm.queue, old, qm.position));
}
}