Fixes to prevent problems with async store when queue is deleted before all messages are completed or dequeued

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

1 files changed, 4 insertions, 1 deletions

diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/cpp/src/qpid/broker/PersistableMessage.cpp
index f3ca574503..3bf390faf3 100644
--- a/cpp/src/qpid/broker/PersistableMessage.cpp
+++ b/cpp/src/qpid/broker/PersistableMessage.cpp
@@ -38,7 +38,10 @@ void PersistableMessage::flush()
 	}
     }
     for (syncList::iterator i = copy.begin(); i != copy.end(); ++i) {
-        store->flush(*(*i));
+        PersistableQueue::shared_ptr q(i->lock());
+        if (q) {
+            store->flush(*q);
+        }
     } 
 }