diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-01 11:57:24 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-01 11:57:24 +0000 |
| commit | beddd768f34d34f181e2f5b9a7c85081daa58d30 (patch) | |
| tree | 45fe1e884a1b351f8dc180bbbcd69a710f0ae388 | |
| parent | 94bc70c2821aa4fd71c1b6817729d4d016ccf5eb (diff) | |
| download | qpid-python-beddd768f34d34f181e2f5b9a7c85081daa58d30.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@1239095 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java | 2 |
1 files changed, 1 insertions, 1 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 e13600acb3..e57390163c 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 @@ -193,7 +193,7 @@ public class SimpleQueueEntryList implements QueueEntryList<SimpleQueueEntryImpl else { SimpleQueueEntryImpl unscavengedHWM = _unscavengedHWM.get(); - if(unscavengedHWM != null && unscavengedHWM.compareTo(next) < 0) + if(unscavengedHWM != null && (next == null || unscavengedHWM.compareTo(next) < 0)) { _unscavengedHWM.compareAndSet(unscavengedHWM, null); } |