You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2018/11/28 15:27:18 UTC

qpid-dispatch git commit: DISPATCH-1196 - Fix an accounting error affecting delivery reference counts.

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 2ac2c6ee5 -> ea579f911


DISPATCH-1196 - Fix an accounting error affecting delivery reference counts.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ea579f91
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ea579f91
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ea579f91

Branch: refs/heads/master
Commit: ea579f9119f8088c55841c6c924b0d77caffe314
Parents: 2ac2c6e
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Nov 28 10:25:17 2018 -0500
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Nov 28 10:25:17 2018 -0500

----------------------------------------------------------------------
 src/router_node.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ea579f91/src/router_node.c
----------------------------------------------------------------------
diff --git a/src/router_node.c b/src/router_node.c
index 84472fc..aa5968d 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -342,8 +342,8 @@ static bool AMQP_rx_handler(void* context, qd_link_t *link)
         if (qd_message_is_discard(msg)) {
             if (qdr_delivery_disposition(delivery) != 0)
                 pn_delivery_update(pnd, qdr_delivery_disposition(delivery));
+            qdr_node_disconnect_deliveries(router->router_core, link, delivery, pnd);
             pn_delivery_settle(pnd);
-            qdr_delivery_decref(router->router_core, delivery, "release protection of return from delivery discard");
         }
 
         // Link stalling may have ignored some delivery events.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org