diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Queue.h | 10 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.cpp | 2 |
3 files changed, 17 insertions, 10 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(); +} 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; diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index 8651b9034c..d844cc5086 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -280,7 +280,7 @@ bool SemanticState::ConsumerImpl::deliver(QueuedMessage& msg) parent->deliveryAdapter.deliver(msg.payload, token); if (windowing || ackExpected) { parent->record(DeliveryRecord(msg, queue, name, token, deliveryTag, acquire, !ackExpected)); - } else if (!ackExpected) { + } else if (acquire && !ackExpected) { queue->dequeue(0, msg.payload); } } |