broker/Message, IncompleteMessageList: drop waitFor(De|En)Complete, replace with callbacks.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@712258 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 2 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 89c647358a..a99a10180e 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -348,7 +348,7 @@ void Message::allEnqueuesComplete() {
         sys::Mutex::ScopedLock l(lock);
         swap(cb, enqueueCallback);
     }
-    if (cb && *cb) (*cb)(*this);
+    if (cb && *cb) (*cb)(intrusive_ptr<Message>(this));
 }
 
 void Message::allDequeuesComplete() {
@@ -357,7 +357,11 @@ void Message::allDequeuesComplete() {
         sys::Mutex::ScopedLock l(lock);
         swap(cb, dequeueCallback);
     }
-    if (cb && *cb) (*cb)(*this);
+    if (cb && *cb) (*cb)(intrusive_ptr<Message>(this));
 }
 
+void Message::setEnqueueCompleteCallback(MessageCallback& cb) { enqueueCallback = &cb; }
+
+void Message::setDequeueCompleteCallback(MessageCallback& cb) { dequeueCallback = &cb; }
+
 }} // namespace qpid::broker