From 2ea7c97175e25cb7ab746de50cc0263312c3fd9b Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Tue, 30 Jul 2013 16:51:11 +0000
Subject: 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
---
 cpp/src/qpid/broker/DeliveryRecord.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'cpp/src')

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()
-- 
cgit v1.2.1