activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1328724 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
Date Sat, 21 Apr 2012 18:58:09 GMT
Author: gtully
Date: Sat Apr 21 18:58:09 2012
New Revision: 1328724

URL: http://svn.apache.org/viewvc?rev=1328724&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3805 - fix up unit test regressions with java.util.ConcurrentModificationException
due to dispatch no longer being copy on write, shows up need to use iterator in message expiry
case

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=1328724&r1=1328723&r2=1328724&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
Sat Apr 21 18:58:09 2012
@@ -298,7 +298,7 @@ public abstract class PrefetchSubscripti
                         if (broker.isExpired(node)) {
                             node.getRegionDestination().messageExpired(context, this, node);
                         }
-                        dispatched.remove(node);
+                        iter.remove();
                         node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
                     }
                     if (ack.getLastMessageId().equals(node.getMessageId())) {



Mime
View raw message