Reduce the scope over which lock is held during purge of expired messages.

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

1 files changed, 12 insertions, 8 deletions

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index ccd7c1fa3e..e608ef270b 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -405,15 +405,19 @@ QueuedMessage Queue::get(){
 
 void Queue::purgeExpired()
 {
-    Mutex::ScopedLock locker(messageLock);
-    for (Messages::iterator i = messages.begin(); i != messages.end(); ) {
-        if (i->payload->hasExpired()) {
-            dequeue(0, *i);
-            i = messages.erase(i);
-        } else {
-            ++i;
+    Messages expired;
+    {
+        Mutex::ScopedLock locker(messageLock);
+        for (Messages::iterator i = messages.begin(); i != messages.end();) {
+            if (i->payload->hasExpired()) {
+                expired.push_back(*i);
+                i = messages.erase(i);
+            } else {
+                ++i;
+            }
         }
-    } 
+    }
+    for_each(expired.begin(), expired.end(), bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
 }
 
 /**