qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1634115 - /qpid/proton/trunk/proton-c/src/transport/transport.c
Date Fri, 24 Oct 2014 18:21:36 GMT
Author: rhs
Date: Fri Oct 24 18:21:35 2014
New Revision: 1634115

URL: http://svn.apache.org/r1634115
Log:
PROTON-728: don't try to settle the delivery, just abort the connection

Modified:
    qpid/proton/trunk/proton-c/src/transport/transport.c

Modified: qpid/proton/trunk/proton-c/src/transport/transport.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/transport/transport.c?rev=1634115&r1=1634114&r2=1634115&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/transport/transport.c (original)
+++ qpid/proton/trunk/proton-c/src/transport/transport.c Fri Oct 24 18:21:35 2014
@@ -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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message