Repository: activemq-6 Updated Branches: refs/heads/master 98153ec1d -> a2a5b35bb
ACTIVEMQ6-71 - fix duplicates in TotalQueueIterator https://issues.apache.org/jira/browse/ACTIVEMQ6-71 remove the intermediateReference iterator as these may be moved anyway Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/dade7290 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/dade7290 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/dade7290 Branch: refs/heads/master Commit: dade72905bb754f5488f8c5e160959709a51045b Parents: 98153ec Author: Andy Taylor <[email protected]> Authored: Mon Jan 19 16:49:02 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Tue Jan 20 20:20:47 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/core/server/impl/QueueImpl.java | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/dade7290/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java index 90d424c..5fa884b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java @@ -3122,7 +3122,6 @@ public class QueueImpl implements Queue private class TotalQueueIterator implements LinkedListIterator<MessageReference> { LinkedListIterator<PagedReference> pageIter = null; - Iterator<MessageReference> interIterator = null; LinkedListIterator<MessageReference> messagesIterator = null; Iterator lastIterator = null; @@ -3133,7 +3132,6 @@ public class QueueImpl implements Queue { pageIter = pageSubscription.iterator(); } - interIterator = intermediateMessageReferences.iterator(); messagesIterator = new SynchronizedIterator(messageReferences.iterator()); } @@ -3145,11 +3143,6 @@ public class QueueImpl implements Queue lastIterator = messagesIterator; return true; } - if (interIterator.hasNext()) - { - lastIterator = interIterator; - return true; - } if (pageIter != null) { if (pageIter.hasNext()) @@ -3170,11 +3163,6 @@ public class QueueImpl implements Queue MessageReference msg = messagesIterator.next(); return msg; } - if (interIterator.hasNext()) - { - lastIterator = interIterator; - return interIterator.next(); - } if (pageIter != null) { if (pageIter.hasNext())
