summaryrefslogtreecommitdiff
path: root/qpid/java/broker
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2012-05-09 09:32:55 +0000
committerKeith Wall <kwall@apache.org>2012-05-09 09:32:55 +0000
commitf982f86ceede56c2fa153e1cef21a31a75b5a669 (patch)
tree18205cbd998dfd2868483f43d1b2fbad9b2ec6db /qpid/java/broker
parent55fe552069b300c041011e26323d38687ec52d12 (diff)
downloadqpid-python-f982f86ceede56c2fa153e1cef21a31a75b5a669.tar.gz
QPID-3980: Last Value Queue: Replaced conflation queue entries are never deleted (entries remained acquired permanently) causing leak.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1336026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
index 6a2e4f155d..75e6f2cfdc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
@@ -79,10 +79,7 @@ public class ConflationQueueList extends SimpleQueueEntryList
if(oldEntry.compareTo(entry) < 0)
{
// We replaced some other entry to become the newest value
- if(oldEntry.acquire())
- {
- discardEntry(oldEntry);
- }
+ discardEntry(oldEntry);
}
else if (oldEntry.compareTo(entry) > 0)
{