You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/11/13 16:14:31 UTC
svn commit: r1408775 -
/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
Author: rgodfrey
Date: Tue Nov 13 15:14:31 2012
New Revision: 1408775
URL: http://svn.apache.org/viewvc?rev=1408775&view=rev
Log:
PROTON-129 : Settled deliveries should be removed from the work queue
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1408775&r1=1408774&r2=1408775&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java Tue Nov 13 15:14:31 2012
@@ -109,7 +109,14 @@ public class DeliveryImpl implements Del
{
_settled = true;
_link.decrementUnsettled();
- setTransportFlag(DELIVERY_STATE_CHANGED);
+ if(!_remoteSettled)
+ {
+ setTransportFlag(DELIVERY_STATE_CHANGED);
+ }
+ else
+ {
+ _transportDelivery.settled();
+ }
if(_link.current() == this)
{
_link.advance();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org