Backed out last change; not sure it actually makes sense.

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

2 files changed, 2 insertions, 12 deletions

diff --git a/cpp/src/qpid/broker/IncompleteMessageList.cpp b/cpp/src/qpid/broker/IncompleteMessageList.cpp
index fbeec7afae..2077e633ec 100644
--- a/cpp/src/qpid/broker/IncompleteMessageList.cpp
+++ b/cpp/src/qpid/broker/IncompleteMessageList.cpp
@@ -25,20 +25,13 @@ namespace qpid {
 namespace broker {
 
 IncompleteMessageList::IncompleteMessageList() :
-    callback(boost::bind(&IncompleteMessageList::enqueueComplete, this, _1)), closed(false)
+    callback(boost::bind(&IncompleteMessageList::enqueueComplete, this, _1))
 {}
 
 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)
@@ -64,9 +57,8 @@ void IncompleteMessageList::process(const CompletionListener& listen, bool sync)
                     sys::Mutex::ScopedUnlock u(lock);
                     msg->flush(); // Can re-enter IncompleteMessageList::enqueueComplete
                 }
-                while (!msg->isEnqueueComplete() && !closed)
+                while (!msg->isEnqueueComplete())
                     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 98971ebff0..f89c0023b0 100644
--- a/cpp/src/qpid/broker/IncompleteMessageList.h
+++ b/cpp/src/qpid/broker/IncompleteMessageList.h
@@ -39,7 +39,6 @@ class IncompleteMessageList
     sys::Monitor lock;
     Messages incomplete;
     Message::MessageCallback callback;
-    bool closed;
 
 public:
     typedef Message::MessageCallback CompletionListener;    
@@ -47,7 +46,6 @@ public:
     IncompleteMessageList();
     ~IncompleteMessageList();
     
-    void close();
     void add(boost::intrusive_ptr<Message> msg);
     void process(const CompletionListener& l, bool sync);
     void each(const CompletionListener& l);