diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-12 20:11:15 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-12 20:11:15 +0000 |
| commit | 937fe6e7295efff28cb680642fca28ebf65e7d4e (patch) | |
| tree | f6bc1c2cbcbcf88e5fca25d21812e4dc7f70393b /cpp/src/qpid/broker/IncompleteMessageList.cpp | |
| parent | 61d8c2e20184aeeb8be8ea569b02ac9fb0e62704 (diff) | |
| download | qpid-python-937fe6e7295efff28cb680642fca28ebf65e7d4e.tar.gz | |
Fix for deadlock beween journal timer & connection threads.
See https://bugzilla.redhat.com/show_bug.cgi?id=570154.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@922411 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/IncompleteMessageList.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/IncompleteMessageList.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/IncompleteMessageList.cpp b/cpp/src/qpid/broker/IncompleteMessageList.cpp index 02265ab85c..a061e872d0 100644 --- a/cpp/src/qpid/broker/IncompleteMessageList.cpp +++ b/cpp/src/qpid/broker/IncompleteMessageList.cpp @@ -30,7 +30,8 @@ IncompleteMessageList::IncompleteMessageList() : IncompleteMessageList::~IncompleteMessageList() { - sys::Mutex::ScopedLock l(lock); + // No lock here. We are relying on Messsag::reset*CompleteCallback + // to ensure no callbacks are in progress before they return. for (Messages::iterator i = incomplete.begin(); i != incomplete.end(); ++i) { (*i)->resetEnqueueCompleteCallback(); (*i)->resetDequeueCompleteCallback(); |