Author: rgodfrey
Date: Tue May 17 14:13:00 2016
New Revision: 1744276
URL: http://svn.apache.org/viewvc?rev=1744276&view=rev
Log:
QPID-7269 : Do not issue a disposition update from a sending link when the peer
has already settled the disposition
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java?rev=1744276&r1=1744275&r2=1744276&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
Tue May 17 14:13:00 2016
@@ -395,8 +395,14 @@ class ConsumerTarget_1_0 extends Abstrac
{
public void postCommit()
{
- //_link.getEndpoint().settle(_deliveryTag);
-
_link.getEndpoint().updateDisposition(_deliveryTag, (DeliveryState)outcome,
true);
+ if(Boolean.TRUE.equals(settled))
+ {
+ _link.getEndpoint().settle(_deliveryTag);
+ }
+ else
+ {
+
_link.getEndpoint().updateDisposition(_deliveryTag, (DeliveryState) outcome,
true);
+ }
_link.getEndpoint().sendFlowConditional();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
