Exception handling for dispatch functor

Don't dequeue no-ack messages unless they have been acquired



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

1 files changed, 15 insertions, 0 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index a250009c77..1484fe464e 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -556,3 +556,18 @@ bool Queue::hasExclusiveConsumer() const
 { 
     return exclusive; 
 }
+
+void Queue::DispatchFunctor::operator()()
+{
+    try {
+        if (consumer && !consumer->preAcquires()) {
+            queue.serviceBrowser(consumer);                        
+        }else{
+            queue.dispatch(); 
+        }
+    } catch (const std::exception& e) {
+        QPID_LOG(error, "Exception on dispatch: " << e.what());
+    }
+    
+    if (sync) sync->completed();
+}