summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2016-01-21 21:06:01 +0000
committerGordon Sim <gsim@apache.org>2016-01-21 21:06:01 +0000
commit60a621ee8949a710d36ee417cb56e98318c9c096 (patch)
tree8a363d6b88c7df20a59deaf0163bb2bf5b5573e0
parent2a6b4e8f1d1ae5e5a86b3e156a2b0fbc81195237 (diff)
downloadqpid-python-60a621ee8949a710d36ee417cb56e98318c9c096.tar.gz
QPID-7010: ignore updates on deliveries we have already settled
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1726098 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
index 72a5c59667..90c268418f 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
@@ -111,7 +111,7 @@ void OutgoingFromQueue::handle(pn_delivery_t* delivery)
{
size_t i = Record::getIndex(pn_delivery_tag(delivery));
Record& r = deliveries[i];
- if (pn_delivery_updated(delivery)) {
+ if (r.delivery && pn_delivery_updated(delivery)) {
assert(r.delivery == delivery);
r.disposition = pn_delivery_remote_state(delivery);