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, 1 insertions, 9 deletions

diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index e554c1011a..20eb7c0800 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -71,15 +71,7 @@ namespace qpid {
 
                 DispatchFunctor(Queue& q, DispatchCompletion* s = 0) : queue(q), sync(s) {}
                 DispatchFunctor(Queue& q, Consumer::ptr c, DispatchCompletion* s = 0) : queue(q), consumer(c), sync(s) {}
-                void operator()()
-                {
-                    if (consumer && !consumer->preAcquires()) {
-                        queue.serviceBrowser(consumer);                        
-                    }else{
-                        queue.dispatch(); 
-                    }
-                    if (sync) sync->completed();
-                }
+                void operator()();
             };
                 
             const string name;