You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2018/02/20 19:28:15 UTC
qpid-dispatch git commit: DISPATCH-882 - Removed unneeded rejection
of aborted deliveries.
Repository: qpid-dispatch
Updated Branches:
refs/heads/1.0.x 3fabd9629 -> e88e8b92f
DISPATCH-882 - Removed unneeded rejection of aborted deliveries.
(cherry picked from commit 16d60e78759ff425a77a5996df24f90393e0d355)
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/e88e8b92
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/e88e8b92
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/e88e8b92
Branch: refs/heads/1.0.x
Commit: e88e8b92f7a26e1ad81e8cbf3de0cba7fa105514
Parents: 3fabd96
Author: Ted Ross <tr...@redhat.com>
Authored: Tue Dec 5 10:49:06 2017 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Tue Feb 20 14:27:48 2018 -0500
----------------------------------------------------------------------
src/router_node.c | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e88e8b92/src/router_node.c
----------------------------------------------------------------------
diff --git a/src/router_node.c b/src/router_node.c
index 5251c0a..08cafde 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -1370,12 +1370,6 @@ static uint64_t CORE_link_deliver(void *context, qdr_link_t *link, qdr_delivery_
if (send_complete) {
if (qd_message_aborted(msg_out)) {
-
- // This message has been aborted. When a sender aborts a message
- // the message is implicitly settled. The caller will need to tell
- // the core that the delivery has been rejected and settled.
- update = PN_REJECTED;
-
// Aborted messages must be settled locally
// Settling does not produce any disposition to message sender.
if (pdlv) {
@@ -1384,7 +1378,6 @@ static uint64_t CORE_link_deliver(void *context, qdr_link_t *link, qdr_delivery_
pn_link_advance(plink);
pn_delivery_settle(pdlv);
}
-
} else {
if (!settled && remote_snd_settled) {
// The caller must tell the core that the delivery has been
@@ -1399,7 +1392,6 @@ static uint64_t CORE_link_deliver(void *context, qdr_link_t *link, qdr_delivery_
if (pdlv)
pn_delivery_settle(pdlv);
}
-
}
}
return update;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org