2 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/IncompleteMessageList.cpp b/cpp/src/qpid/broker/IncompleteMessageList.cpp
index 2077e633ec..fbeec7afae 100644
--- a/cpp/src/qpid/broker/IncompleteMessageList.cpp
+++ b/cpp/src/qpid/broker/IncompleteMessageList.cpp
@@ -25,13 +25,20 @@ namespace qpid {
 namespace broker {
 
 IncompleteMessageList::IncompleteMessageList() :
-    callback(boost::bind(&IncompleteMessageList::enqueueComplete, this, _1))
+    callback(boost::bind(&IncompleteMessageList::enqueueComplete, this, _1)), closed(false)
 {}
 
 IncompleteMessageList::~IncompleteMessageList() 
 {
+    close();
+}
+
+void IncompleteMessageList::close() 
+{
     sys::Mutex::ScopedLock l(lock);
+    closed = true;
     std::for_each(incomplete.begin(), incomplete.end(), boost::bind(&Message::resetEnqueueCompleteCallback, _1));
+    lock.notify();
 }
 
 void IncompleteMessageList::add(boost::intrusive_ptr<Message> msg)
@@ -57,8 +64,9 @@ void IncompleteMessageList::process(const CompletionListener& listen, bool sync)
                     sys::Mutex::ScopedUnlock u(lock);
                     msg->flush(); // Can re-enter IncompleteMessageList::enqueueComplete
                 }
-                while (!msg->isEnqueueComplete())
+                while (!msg->isEnqueueComplete() && !closed)
                     lock.wait();
+                if (closed) return;
             } else {
                 //leave the message as incomplete for now
                 return;
diff --git a/cpp/src/qpid/broker/IncompleteMessageList.h b/cpp/src/qpid/broker/IncompleteMessageList.h
index f89c0023b0..98971ebff0 100644
--- a/cpp/src/qpid/broker/IncompleteMessageList.h
+++ b/cpp/src/qpid/broker/IncompleteMessageList.h
@@ -39,6 +39,7 @@ class IncompleteMessageList
     sys::Monitor lock;
     Messages incomplete;
     Message::MessageCallback callback;
+    bool closed;
 
 public:
     typedef Message::MessageCallback CompletionListener;    
@@ -46,6 +47,7 @@ public:
     IncompleteMessageList();
     ~IncompleteMessageList();
     
+    void close();
     void add(boost::intrusive_ptr<Message> msg);
     void process(const CompletionListener& l, bool sync);
     void each(const CompletionListener& l);