summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-09-25 12:51:09 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-09-25 12:51:09 +0000
commitf782284d8cc4d3c3cb969c06dd1bfbbb6ec2d160 (patch)
treea439bc58c599eeb090d3c8aafaa77c40a8057701 /java
parent24a6914e1f823e9f38d7b721e29c369720750c6b (diff)
downloadqpid-python-f782284d8cc4d3c3cb969c06dd1bfbbb6ec2d160.tar.gz
QPID-610 : Fix for Get NO_ACK leak. The Java Client doesn't use get so augmented the python test_get to send persistent messages and used debugger to verify that messages were correctly removed. Verified that prior to this commit they would remain in the store. We need a management exchange to fully validate this with a python tests.
NOTE: The setting of "delivery mode" property on M2.1 is not the same as on trunk where _ is use such as "delivery_mode". There is also no error that you have sent an incorrect property. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579229 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
index 026761a618..ea077d659f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
@@ -330,6 +330,11 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager
deliveryTag, _queue.getMessageCount());
_totalMessageSize.addAndGet(-msg.getSize());
}
+
+ if (!acks)
+ {
+ msg.decrementReference(channel.getStoreContext());
+ }
}
finally
{