From 94bc70c2821aa4fd71c1b6817729d4d016ccf5eb Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 1 Feb 2012 11:53:55 +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@1239094 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/queue/SimpleQueueEntryList.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'qpid/java')

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