diff options
| author | Gordon Sim <gsim@apache.org> | 2007-11-08 15:55:41 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-11-08 15:55:41 +0000 |
| commit | 36af925c0645e87661df4ba8448244b69492a0c1 (patch) | |
| tree | eab5bf51dd1b68593583353be9374b02bd9277a3 /cpp/src/qpid/broker/SemanticState.cpp | |
| parent | a95e226914600dd00434addda8661c8286da3a0d (diff) | |
| download | qpid-python-36af925c0645e87661df4ba8448244b69492a0c1.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker/SemanticState.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |