summaryrefslogtreecommitdiff
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
commit75625dcf853e8ea81eda64f44761d7d66a7eb313 (patch)
tree796ee26e88e1e4cd2538d2747cbcee0b07e2e2b6
parent48d3b387dd4fcbdda84f32a4a2f84da67d09ea9f (diff)
downloadqpid-python-75625dcf853e8ea81eda64f44761d7d66a7eb313.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@782979 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Queue.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index dff28f189e..e5bcf9ef57 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/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));
}
}