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/Message.h | |
| 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/Message.h')
| -rw-r--r-- | cpp/src/qpid/broker/Message.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h index 0a7772040b..353044c577 100644 --- a/cpp/src/qpid/broker/Message.h +++ b/cpp/src/qpid/broker/Message.h @@ -26,7 +26,7 @@ #include "qpid/broker/PersistableMessage.h" #include "qpid/broker/MessageAdapter.h" #include "qpid/framing/amqp_types.h" -#include "qpid/sys/Mutex.h" +#include "qpid/sys/Monitor.h" #include "qpid/sys/Time.h" #include <boost/function.hpp> #include <boost/shared_ptr.hpp> @@ -189,9 +189,10 @@ public: mutable Replacement replacement; mutable boost::intrusive_ptr<Message> empty; - sys::Mutex callbackLock; + sys::Monitor callbackLock; MessageCallback* enqueueCallback; MessageCallback* dequeueCallback; + bool inCallback; uint32_t requiredCredit; }; |