From 60a621ee8949a710d36ee417cb56e98318c9c096 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 21 Jan 2016 21:06:01 +0000 Subject: 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 --- qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.1