From ad551b003bd50fb79db8be9f88ca63d9b414a42e Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Thu, 8 Nov 2007 10:08:26 +0000
Subject: Ensure browsers are always serviced on the serializers dispatch
 thread to avoid concurrent servicing threads interfering with each other.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@593112 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Queue.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'cpp/src/qpid/broker/Queue.h')

diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index f247312b60..e554c1011a 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -66,11 +66,18 @@ namespace qpid {
             struct DispatchFunctor 
             {
                 Queue& queue;
+                Consumer::ptr consumer;
                 DispatchCompletion* sync;
+
                 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()()
                 {
-                    queue.dispatch(); 
+                    if (consumer && !consumer->preAcquires()) {
+                        queue.serviceBrowser(consumer);                        
+                    }else{
+                        queue.dispatch(); 
+                    }
                     if (sync) sync->completed();
                 }
             };
-- 
cgit v1.2.1