1 files changed, 11 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/cpp/src/qpid/broker/PersistableMessage.cpp
index a00a623988..f3ca574503 100644
--- a/cpp/src/qpid/broker/PersistableMessage.cpp
+++ b/cpp/src/qpid/broker/PersistableMessage.cpp
@@ -28,12 +28,18 @@ using namespace qpid::broker;
 
 void PersistableMessage::flush()
 {
-    sys::ScopedLock<sys::Mutex> l(storeLock);
-    if (store) {
-        for (syncList::iterator i = synclist.begin(); i != synclist.end(); ++i) {
-            store->flush(*(*i));
-        } 
+    syncList copy;
+    {
+        sys::ScopedLock<sys::Mutex> l(storeLock);
+	if (store) {
+	    copy = synclist;
+	} else {
+            return;//early exit as nothing to do
+	}
     }
+    for (syncList::iterator i = copy.begin(); i != copy.end(); ++i) {
+        store->flush(*(*i));
+    } 
 }