Author: kfujino
Date: Mon Jul 22 08:51:27 2013
New Revision: 1505628
URL: http://svn.apache.org/r1505628
Log:
Avoid ConcurrentModificationException when sending a heartbeat.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1505628&r1=1505627&r2=1505628&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Mon Jul 22 08:51:27 2013
@@ -18,8 +18,9 @@ package org.apache.catalina.tribes.group
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.catalina.tribes.ByteMessage;
import org.apache.catalina.tribes.Channel;
@@ -92,12 +93,12 @@ public class GroupChannel extends Channe
/**
* A list of membership listeners that subscribe to membership
announcements
*/
- protected ArrayList<Object> membershipListeners = new ArrayList<Object>();
+ protected List<Object> membershipListeners = new
CopyOnWriteArrayList<Object>();
/**
* A list of channel listeners that subscribe to incoming messages
*/
- protected ArrayList<Object> channelListeners = new ArrayList<Object>();
+ protected List<Object> channelListeners = new
CopyOnWriteArrayList<Object>();
/**
* If set to true, the GroupChannel will check to make sure that
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1505628&r1=1505627&r2=1505628&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 22 08:51:27 2013
@@ -158,6 +158,10 @@
It will try to join the map membership in the heartbeat. Default value
is false. (kfujino)
</add>
+ <fix>
+ Avoid ConcurrentModificationException when sending a heartbeat.
+ (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
