Update to AMQMessage to reset the deliveredToConsumer flag(false) when the message is released. This flag is now used by more than the immediate delivery. It is also used to understand if the message has been delivered so that we can tell the message should not be purged.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585570 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 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 01d0d870d7..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
@@ -133,7 +133,7 @@ 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
@@ -558,6 +558,7 @@ public class AMQMessage
                 taken.set(false);
             }
 
+            _deliveredToConsumer = false;
             _takenMap.put(queue, taken);
             _takenBySubcriptionMap.put(queue, null);
         }
@@ -694,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;