diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-01 11:53:55 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-01 11:53:55 +0000 |
| commit | 94bc70c2821aa4fd71c1b6817729d4d016ccf5eb (patch) | |
| tree | 00e4b250ad7b2a118b47f142f61506d7728d2b5b | |
| parent | 73e7c601fa00f93add1661920cca1dc7a9c3c2ef (diff) | |
| download | qpid-python-94bc70c2821aa4fd71c1b6817729d4d016ccf5eb.tar.gz | |
QPID-3780 : guard against the possibility that the HWM is older than the queue head
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239094 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java index d74431aae7..e13600acb3 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java @@ -190,6 +190,14 @@ public class SimpleQueueEntryList implements QueueEntryList<SimpleQueueEntryImpl scavenge(); } } + else + { + SimpleQueueEntryImpl unscavengedHWM = _unscavengedHWM.get(); + if(unscavengedHWM != null && unscavengedHWM.compareTo(next) < 0) + { + _unscavengedHWM.compareAndSet(unscavengedHWM, null); + } + } } public int getPriorities() |