Dequeue persistent messages from store in queue purge

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

1 files changed, 9 insertions, 1 deletions

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 1eeb1fb7f8..08af97eb48 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -387,7 +387,15 @@ QueuedMessage Queue::dequeue(){
 uint32_t Queue::purge(){
     Mutex::ScopedLock locker(messageLock);
     int count = messages.size();
-    while(!messages.empty()) pop();
+    while(!messages.empty()) {
+        QueuedMessage& msg = messages.front();
+        if (store && msg.payload->isPersistent()) {
+            boost::intrusive_ptr<PersistableMessage> pmsg =
+                boost::static_pointer_cast<PersistableMessage>(msg.payload);
+            store->dequeue(0, pmsg, *this);
+        }
+        pop();
+    }
     return count;
 }