summaryrefslogtreecommitdiff
path: root/qpid/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
commite3a8dda169c7e60621ef171476438679e829c653 (patch)
tree0f332b684de0a251831ef3b5208d9999e2b4bf61 /qpid/cpp
parent4eb4dfda8802110d7fd3d719d377732735cb770e (diff)
downloadqpid-python-e3a8dda169c7e60621ef171476438679e829c653.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@1002147 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/DeliveryRecord.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index 64db84b6ec..b3a49c485d 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/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