From 937fe6e7295efff28cb680642fca28ebf65e7d4e Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 12 Mar 2010 20:11:15 +0000
Subject: 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
---
 cpp/src/qpid/broker/Message.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cpp/src/qpid/broker/Message.h')

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;
 };
-- 
cgit v1.2.1