2 files changed, 6 insertions, 10 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
index 7fc5df4e9e..f22220ada9 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
@@ -170,14 +170,15 @@ public interface QueueEntry extends Comparable<QueueEntry>, Filterable<AMQExcept
     boolean isDeleted();
 
     boolean acquiredBySubscription();
-
-    void setDeliveredToSubscription();
-
+    
     /**
      * Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality).
      * And for selector efficiency.
+     *
+     * This is now also used to unload the message if this entry is on a flowed queue. As a result this method should
+     * only be called after the message has been sent.
      */
-    public void setDeliveredToConsumer();    
+    void setDeliveredToSubscription();
 
     void release();
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 715dd0c385..1a3e08ab5c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -158,7 +158,7 @@ public class QueueEntryImpl implements QueueEntry
         return (_flags & DELIVERED_TO_CONSUMER) != 0;
     }
 
-    public void setDeliveredToConsumer()
+    public void setDeliveredToSubscription()
     {
         _flags |= DELIVERED_TO_CONSUMER;
 
@@ -223,11 +223,6 @@ public class QueueEntryImpl implements QueueEntry
         return (_state instanceof SubscriptionAcquiredState);
     }
 
-    public void setDeliveredToSubscription()
-    {
-        _flags |= DELIVERED_TO_CONSUMER;
-    }
-
     public void release()
     {
         _stateUpdater.set(this, AVAILABLE_STATE);