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 | 732841a25e906907be0b9358528bf7e73fcf48ef (patch) | |
| tree | 2012bbbb0261a09cb241bb7f6a5dd9133067f430 /java | |
| parent | aa267066cd66693d994b0a823fa977f0d4f6fe63 (diff) | |
| download | qpid-python-732841a25e906907be0b9358528bf7e73fcf48ef.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/qpid@1239095 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java index e13600acb3..e57390163c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java +++ b/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); } |