QPID-1735 : Removed duplicated methods with differing functionality that was causing FtD to fail. Annoyingly the tests work as they used the method with the extra functionality.

    Commit from 0.5-release : r758382



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@758395 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 22 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);
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 4c9de73a0b..22e49a0241 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -280,11 +280,6 @@ public class AbstractHeadersExchangeTestBase extends TestCase
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void setDeliveredToConsumer()
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
                 public void release()
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
index 66ba47ec13..75b0d0ab60 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.queue;
 
 import junit.framework.TestCase;
-import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -33,7 +32,6 @@ import java.util.concurrent.locks.ReentrantLock;
 
 public class QueueEntryImplTest extends TestCase
 {
-    protected static final Logger _log = Logger.getLogger(QueueEntryImplTest.class);
 
     /** Test the Redelivered state of a QueueEntryImpl */
     public void testRedelivered()
@@ -76,7 +74,7 @@ public class QueueEntryImplTest extends TestCase
 
             assertFalse("Undelivered Message should not say it is delivered.", queueEntry.getDeliveredToConsumer());
 
-            queueEntry.setDeliveredToConsumer();
+            queueEntry.setDeliveredToSubscription();
 
             assertTrue("Delivered Message should say it is delivered.", queueEntry.getDeliveredToConsumer());
 
@@ -111,7 +109,7 @@ public class QueueEntryImplTest extends TestCase
 
             assertFalse("Undelivered Message should not say it is delivered.", queueEntry.getDeliveredToConsumer());
 
-            queueEntry.setDeliveredToConsumer();
+            queueEntry.setDeliveredToSubscription();
 
             assertTrue("Delivered Message should say it is delivered.", queueEntry.getDeliveredToConsumer());
 
@@ -170,9 +168,6 @@ public class QueueEntryImplTest extends TestCase
                 }
 
             }
-            _log.info("m.GetExpiration:" + message.getExpiration());
-            _log.info("qe.GetExpiration:" + ((QueueEntryImpl)queueEntry).getExpiration());
-            _log.info("AfterSleep:" + System.currentTimeMillis());
             assertTrue("After a sleep messages should now be expired.", queueEntry.expired());
 
         }