Repository: qpid-dispatch Updated Branches: refs/heads/master bdf489a1f -> 9e638d61d
DISPATCH-262 - Make sure that send-settle-mode is only acted upon if the delivery is unsettled. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9e638d61 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9e638d61 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9e638d61 Branch: refs/heads/master Commit: 9e638d61d668ad3c6b8ae094635a0fa3fc15c52d Parents: bdf489a Author: Ted Ross <[email protected]> Authored: Thu Apr 7 10:43:34 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Thu Apr 7 10:44:47 2016 -0400 ---------------------------------------------------------------------- src/router_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9e638d61/src/router_node.c ---------------------------------------------------------------------- diff --git a/src/router_node.c b/src/router_node.c index 38c9027..ed1b51c 100644 --- a/src/router_node.c +++ b/src/router_node.c @@ -773,7 +773,7 @@ static void CORE_link_deliver(void *context, qdr_link_t *link, qdr_delivery_t *d qd_message_send(qdr_delivery_message(dlv), qlink, qdr_link_strip_annotations_out(link)); - if (remote_snd_settled) + if (!settled && remote_snd_settled) // Tell the core that the delivery has been accepted and settled, since we are settling on behalf of the receiver qdr_delivery_update_disposition(router->router_core, dlv, PN_ACCEPTED, true); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
