summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-07-30 16:51:11 +0000
committerGordon Sim <gsim@apache.org>2013-07-30 16:51:11 +0000
commitde756778f91f7a8659a12c32df2424bd87bbe208 (patch)
treeda52c36f8dcae5f483b6d2acf541b645f5d8137a
parent0dc1f2f61f17ef80e7378d18946e0957068f9e67 (diff)
downloadqpid-python-de756778f91f7a8659a12c32df2424bd87bbe208.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
-rw-r--r--cpp/src/qpid/broker/DeliveryRecord.cpp4
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()