From 732841a25e906907be0b9358528bf7e73fcf48ef Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 1 Feb 2012 11:57:24 +0000
Subject: 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
---
 .../main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

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);
             }
-- 
cgit v1.2.1