diff options
| author | Gordon Sim <gsim@apache.org> | 2013-07-30 16:51:11 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-07-30 16:51:11 +0000 |
| commit | 2ea7c97175e25cb7ab746de50cc0263312c3fd9b (patch) | |
| tree | da52c36f8dcae5f483b6d2acf541b645f5d8137a /cpp | |
| parent | 42e4af988ce7b96c79b6b56cf55b0672b0595c1d (diff) | |
| download | qpid-python-2ea7c97175e25cb7ab746de50cc0263312c3fd9b.tar.gz | |
QPID-5025: check that delivery has not already been ended before signalling commit of dequeue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1508516 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/broker/DeliveryRecord.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp index 14a2e94571..06ecf62ed4 100644 --- a/cpp/src/qpid/broker/DeliveryRecord.cpp +++ b/cpp/src/qpid/broker/DeliveryRecord.cpp @@ -106,7 +106,9 @@ void DeliveryRecord::dequeue(TransactionContext* ctxt) const void DeliveryRecord::committed() const { - queue->dequeueCommitted(msg); + if (acquired && !ended) { + queue->dequeueCommitted(msg); + } } void DeliveryRecord::reject() |