Author: rajdavies
Date: Mon Sep 22 12:30:04 2008
New Revision: 697957
URL: http://svn.apache.org/viewvc?rev=697957&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1947
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=697957&r1=697956&r2=697957&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Mon Sep 22 12:30:04 2008
@@ -18,11 +18,13 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -84,7 +86,7 @@
protected PendingMessageCursor messages;
private final LinkedHashMap<MessageId,QueueMessageReference>
pagedInMessages = new LinkedHashMap<MessageId,QueueMessageReference>();
// Messages that are paged in but have not yet been targeted at a
subscription
- private List<QueueMessageReference> pagedInPendingDispatch = new
ArrayList<QueueMessageReference>(100);
+ private LinkedHashSet<QueueMessageReference> pagedInPendingDispatch = new
LinkedHashSet<QueueMessageReference>(100);
private MessageGroupMap messageGroupOwners;
private DispatchPolicy dispatchPolicy = new RoundRobinDispatchPolicy();
private MessageGroupMapFactory messageGroupMapFactory = new
MessageGroupHashBucketFactory();
@@ -1217,15 +1219,7 @@
// the pending
// list anything that does not actually get dispatched.
if (list != null && !list.isEmpty()) {
- if (pagedInPendingDispatch.isEmpty()) {
- pagedInPendingDispatch.addAll(doActualDispatch(list));
- } else {
- for (QueueMessageReference qmr : list) {
- if (!pagedInPendingDispatch.contains(qmr)) {
- pagedInPendingDispatch.add(qmr);
- }
- }
- }
+ pagedInPendingDispatch.addAll(doActualDispatch(list));
}
}
} finally {
@@ -1237,8 +1231,8 @@
* @return list of messages that could get dispatched to consumers if they
* were not full.
*/
- private List<QueueMessageReference>
doActualDispatch(List<QueueMessageReference> list) throws Exception {
- List<QueueMessageReference> rc = new
ArrayList<QueueMessageReference>(list.size());
+ private LinkedHashSet<QueueMessageReference>
doActualDispatch(Collection<QueueMessageReference> collection) throws Exception
{
+ LinkedHashSet<QueueMessageReference> rc = new
LinkedHashSet<QueueMessageReference>(collection.size());
Set<Subscription> fullConsumers = new
HashSet<Subscription>(this.consumers.size());
List<Subscription> consumers;
@@ -1246,7 +1240,7 @@
consumers = new ArrayList<Subscription>(this.consumers);
}
- for (MessageReference node : list) {
+ for (MessageReference node : collection) {
Subscription target = null;
int interestCount=0;
for (Subscription s : consumers) {
