1 files changed, 23 insertions, 2 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index afa581f0c5..dd9f32a306 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
@@ -130,6 +130,11 @@ public class AMQMessage
 
     }
 
+    public boolean isReferenced()
+    {
+        return _referenceCount.get() > 0;
+    }
+
     /**
      * Used to iterate through all the body frames associated with this message. Will not keep all the data in memory
      * therefore is memory-efficient.
@@ -553,6 +558,7 @@ public class AMQMessage
                 taken.set(false);
             }
 
+            _deliveredToConsumer = false;
             _takenMap.put(queue, taken);
             _takenBySubcriptionMap.put(queue, null);
         }
@@ -592,7 +598,19 @@ public class AMQMessage
         _transientMessageData.addDestinationQueue(queue);
     }
 
-    public void dequeue(StoreContext storeContext, AMQQueue queue) throws AMQException
+    /**
+     * NOTE: Think about why you are using this method. Normal usages would want to do
+     * AMQQueue.dequeue(StoreContext, AMQMessage)
+     * This will keep the queue statistics up-to-date.
+     * Currently this method is only called _correctly_ from AMQQueue dequeue.
+     * Ideally we would have a better way for the queue to dequeue the message.
+     * Especially since enqueue isn't the recipriocal of this method.
+     * @deprecated
+     * @param storeContext
+     * @param queue
+     * @throws AMQException
+     */
+    void dequeue(StoreContext storeContext, AMQQueue queue) throws AMQException
     {
         _messageHandle.dequeue(storeContext, _messageId, queue);
     }
@@ -677,7 +695,10 @@ public class AMQMessage
         return false;
     }
 
-    /** Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality). */
+    /**
+     * Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality).
+     * And for selector efficiency.
+     */
     public void setDeliveredToConsumer()
     {
         _deliveredToConsumer = true;