QPID-1941: ensure old queue entry is deleted as well as dequeued, so it is not gathered by the viewMessages() method which checks for non deletion


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/jmx_mc_gsoc09@792565 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 0925868..08daf71 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -885,7 +885,7 @@
             for (QueueEntry entry : entries)
             {
                 toQueue.enqueue(storeContext, entry.getMessage());
-
+                entry.delete();
             }
         }
         catch (MessageCleanupException e)