summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJonathan Robie <jonathan@apache.org>2010-09-28 12:46:37 +0000
committerJonathan Robie <jonathan@apache.org>2010-09-28 12:46:37 +0000
commitf5f6a2a4eedf296fda88efb8f5b7ac81b12d7e1a (patch)
tree82d0ec421610c1265c0125160d20c5805b8db037 /cpp
parent37874b37051ae33b7c7f4a7ef6d383f268b736d8 (diff)
downloadqpid-python-f5f6a2a4eedf296fda88efb8f5b7ac81b12d7e1a.tar.gz
Ensure that a rejected message is also dequeued.
Without this fix, rejected messages were dropped, but not dequeued. This meant that durable messages would 're-appear' after a restart. This also meant that the queue message count was incorrect if messages had been rejected. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1002147 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/broker/DeliveryRecord.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp
index 64db84b6ec..b3a49c485d 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -140,6 +140,8 @@ void DeliveryRecord::reject()
//just drop it
QPID_LOG(info, "Dropping rejected message from " << queue->getName());
}
+
+ dequeue();
}
uint32_t DeliveryRecord::getCredit() const