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:57:57 UTC

svn commit: r1408810 - /qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java

Author: rgodfrey
Date: Tue Nov 13 15:57:57 2012
New Revision: 1408810

URL: http://svn.apache.org/viewvc?rev=1408810&view=rev
Log:
PROTON-132 : Unsettled deliveries not being removed from transport session maps

Modified:
    qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java

Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java?rev=1408810&r1=1408809&r2=1408810&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java Tue Nov 13 15:57:57 2012
@@ -338,7 +338,7 @@ class TransportSession
                 if(Boolean.TRUE.equals(disposition.getSettled()))
                 {
                     delivery.setRemoteSettled(true);
-
+                    unsettledDeliveries.remove(id);
                 }
                 delivery.addToWorkList();
             }
@@ -371,12 +371,14 @@ class TransportSession
     {
         if(transportDelivery.getTransportLink().getLink() instanceof ReceiverImpl)
         {
+            _unsettledIncomingDeliveriesById.remove(transportDelivery.getDeliveryId());
             _incomingWindowSize = _incomingWindowSize.add( UnsignedInteger.valueOf(transportDelivery.getSessionSize()));
             _incomingWindowSizeChange = true;
             getSession().modified();
         }
         else
         {
+            _unsettledOutgoingDeliveriesById.remove(transportDelivery.getDeliveryId());
             _outgoingWindowSize = _outgoingWindowSize.add(UnsignedInteger.valueOf(transportDelivery.getSessionSize()));
             _outgoingWindowSizeChange = true;
             getSession().modified();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org