Author: rhs
Date: Tue Mar 13 02:12:46 2012
New Revision: 1299955
URL: http://svn.apache.org/viewvc?rev=1299955&view=rev
Log:
ignore dispositions for settled deliveries; fixed type for source and target
descriptors
Modified:
qpid/proton/proton-c/src/engine/engine.c
Modified: qpid/proton/proton-c/src/engine/engine.c
URL:
http://svn.apache.org/viewvc/qpid/proton/proton-c/src/engine/engine.c?rev=1299955&r1=1299954&r2=1299955&view=diff
==============================================================================
--- qpid/proton/proton-c/src/engine/engine.c (original)
+++ qpid/proton/proton-c/src/engine/engine.c Tue Mar 13 02:12:46 2012
@@ -1009,6 +1009,7 @@ void pn_do_disposition(pn_dispatcher_t *
pn_sequence_t lwm = pn_delivery_buffer_lwm(deliveries);
for (pn_sequence_t id = first; id <= last; id++) {
+ if (id < lwm) continue;
pn_delivery_state_t *state = pn_delivery_buffer_get(deliveries, id - lwm);
pn_delivery_t *delivery = state->delivery;
delivery->remote_state = dispo;
@@ -1131,11 +1132,11 @@ void pn_process_link_setup(pn_transport_
// XXX
pn_field(transport->disp, ATTACH_INITIAL_DELIVERY_COUNT, pn_value("I",
0));
if (link->local_source)
- pn_field(transport->disp, ATTACH_SOURCE, pn_value("B([S])", SOURCE,
- link->local_source));
+ pn_field(transport->disp, ATTACH_SOURCE, pn_value("L([S])", SOURCE,
+ link->local_source));
if (link->local_target)
- pn_field(transport->disp, ATTACH_TARGET, pn_value("B([S])", TARGET,
- link->local_target));
+ pn_field(transport->disp, ATTACH_TARGET, pn_value("L([S])", TARGET,
+ link->local_target));
pn_post_frame(transport->disp, ssn_state->local_channel, ATTACH);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]