summaryrefslogtreecommitdiff
path: root/qpid/cpp
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
commitf7d086f32f39eb34f2f495c85eaa63781a695b1b (patch)
treead57abd959743e62798abece2a218da07323a106 /qpid/cpp
parent14d1bd8b56b2fdc4189bc69312af9e0f3e492c46 (diff)
downloadqpid-python-f7d086f32f39eb34f2f495c85eaa63781a695b1b.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@1508516 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/DeliveryRecord.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index 14a2e94571..06ecf62ed4 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/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()