1 files changed, 50 insertions, 1 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
index 09600b9d28..7fc5df4e9e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
@@ -119,18 +119,48 @@ public interface QueueEntry extends Comparable<QueueEntry>, Filterable<AMQExcept
     final static EntryState EXPIRED_STATE = new ExpiredState();
     final static EntryState NON_SUBSCRIPTION_ACQUIRED_STATE = new NonSubscriptionAcquiredState();
 
+    /** Flag to indicate that this message requires 'immediate' delivery. */
+
+    final static byte IMMEDIATE = 0x01;
+
+    /**
+     * Flag to indicate whether this message has been delivered to a consumer. Used in implementing return functionality
+     * for messages published with the 'immediate' flag.
+     */
+
+    final static byte DELIVERED_TO_CONSUMER = 0x02;
+
+
     AMQQueue getQueue();
 
     AMQMessage getMessage();
 
+    Long getMessageId();
+
     long getSize();
 
+    /**
+      * Called selectors to determin if the message has already been sent
+      *
+      * @return _deliveredToConsumer
+      */
     boolean getDeliveredToConsumer();
 
+    /**
+     * Checks to see if the message has expired. If it has the message is dequeued.
+     *
+     * @return true if the message has expire
+     *
+     * @throws org.apache.qpid.AMQException
+     */
     boolean expired() throws AMQException;
 
+    public void setExpiration(final long expiration);
+
     boolean isAcquired();
 
+    boolean isAvailable();
+
     boolean acquire();
 
     boolean acquire(Subscription sub);
@@ -143,10 +173,22 @@ public interface QueueEntry extends Comparable<QueueEntry>, Filterable<AMQExcept
 
     void setDeliveredToSubscription();
 
+    /**
+     * Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality).
+     * And for selector efficiency.
+     */
+    public void setDeliveredToConsumer();    
+
     void release();
 
     String debugIdentity();
 
+     /**
+      * Called to enforce the 'immediate' flag.
+      *
+      * @returns true if the message is marked for immediate delivery but has not been marked as delivered
+      * to a consumer
+      */
     boolean immediateAndNotDelivered();
 
     void setRedelivered(boolean b);
@@ -180,4 +222,11 @@ public interface QueueEntry extends Comparable<QueueEntry>, Filterable<AMQExcept
     void addStateChangeListener(StateChangeListener listener);
 
     boolean removeStateChangeListener(StateChangeListener listener);
-}
+
+    void unload();
+
+    void load();
+
+    boolean isFlowed();
+
+}
\ No newline at end of file