PROTON-728: don't try to settle the delivery, just abort the connection git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1634115 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f139ae64 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f139ae64 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f139ae64 Branch: refs/heads/examples Commit: f139ae643b22b53b3fe5dc135338de820b99d087 Parents: d16ab03 Author: Rafael H. Schloming <[email protected]> Authored: Fri Oct 24 18:21:35 2014 +0000 Committer: Rafael H. Schloming <[email protected]> Committed: Fri Oct 24 18:21:35 2014 +0000 ---------------------------------------------------------------------- proton-c/src/transport/transport.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f139ae64/proton-c/src/transport/transport.c ---------------------------------------------------------------------- diff --git a/proton-c/src/transport/transport.c b/proton-c/src/transport/transport.c index 4b85c54..f37e636 100644 --- a/proton-c/src/transport/transport.c +++ b/proton-c/src/transport/transport.c @@ -779,12 +779,9 @@ int pn_do_transfer(pn_dispatcher_t *disp) delivery = pn_delivery(link, pn_dtag(tag.start, tag.size)); pn_delivery_state_t *state = pn_delivery_map_push(incoming, delivery); if (id_present && id != state->id) { - int err = pn_do_error(transport, "amqp:session:invalid-field", - "sequencing error, expected delivery-id %u, got %u", - state->id, id); - // XXX: this will probably leave delivery buffer state messed up - pn_full_settle(incoming, delivery); - return err; + return pn_do_error(transport, "amqp:session:invalid-field", + "sequencing error, expected delivery-id %u, got %u", + state->id, id); } link->state.delivery_count++; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
