svn commit: r1505627 - /tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

[kf...@apache.org]

Author: kfujino
Date: Mon Jul 22 08:42:33 2013
New Revision: 1505627

URL: http://svn.apache.org/r1505627
Log:
Avoid ConcurrentModificationException when sending a heartbeat.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1505627&r1=1505626&r2=1505627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon Jul 22 08:42:33 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 final ArrayList<Object> membershipListeners = new ArrayList<>();
+    protected final List<Object> membershipListeners = new CopyOnWriteArrayList<>();
 
     /**
      * A list of channel listeners that subscribe to incoming messages
      */
-    protected final ArrayList<Object> channelListeners = new ArrayList<>();
+    protected final List<Object> channelListeners = new CopyOnWriteArrayList<>();
 
     /**
      * If set to true, the GroupChannel will check to make sure that



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org