Author: rgodfrey
Date: Tue Nov 13 14:56:29 2012
New Revision: 1408765
URL: http://svn.apache.org/viewvc?rev=1408765&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=1408765&r1=1408764&r2=1408765&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 14:56:29 2012
@@ -114,15 +114,7 @@ public class DeliveryImpl implements Del
{
_link.advance();
}
- }
- DeliveryImpl getLinkNext()
- {
- return _linkNext;
- }
-
- public void free()
- {
_link.remove(this);
if(_linkPrevious != null)
{
@@ -132,6 +124,17 @@ public class DeliveryImpl implements Del
{
_linkNext._linkPrevious = _linkPrevious;
}
+ clearWork();
+ }
+
+ DeliveryImpl getLinkNext()
+ {
+ return _linkNext;
+ }
+
+ public void free()
+ {
+
}
DeliveryImpl getLinkPrevious()
@@ -205,7 +208,6 @@ public class DeliveryImpl implements Del
_workNext.setWorkPrev(_workPrev);
}
- _workNext = null;
_workPrev = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
