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@593112 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 10 insertions, 2 deletions

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 44ed743880..a250009c77 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -138,7 +138,8 @@ void Queue::requestDispatch(Consumer::ptr c){
     if (!c || c->preAcquires()) {
         serializer.execute(dispatchCallback);
     } else {
-        serviceBrowser(c);
+        DispatchFunctor f(*this, c);
+        serializer.execute(f);
     }
 }
 
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index f247312b60..e554c1011a 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/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();
                 }
             };