You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2017/09/13 01:20:13 UTC
svn commit: r1808194 - in /tomcat/trunk:
java/org/apache/catalina/tribes/group/RpcChannel.java
webapps/docs/changelog.xml
Author: kfujino
Date: Wed Sep 13 01:20:12 2017
New Revision: 1808194
URL: http://svn.apache.org/viewvc?rev=1808194&view=rev
Log:
Fix race condition of responseMap in RpcChannel.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1808194&r1=1808193&r2=1808194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Wed Sep 13 01:20:12 2017
@@ -19,8 +19,8 @@ package org.apache.catalina.tribes.group
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
@@ -50,7 +50,7 @@ public class RpcChannel implements Chann
private byte[] rpcId;
private int replyMessageOptions = 0;
- private final Map<RpcCollectorKey, RpcCollector> responseMap = new HashMap<>();
+ private final ConcurrentMap<RpcCollectorKey, RpcCollector> responseMap = new ConcurrentHashMap<>();
/**
* Create an RPC channel. You can have several RPC channels attached to a group
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1808194&r1=1808193&r2=1808194&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 13 01:20:12 2017
@@ -229,6 +229,10 @@
Correct the backup node selection logic that node 0 is returned twice
consecutively. (kfujino)
</fix>
+ <fix>
+ Fix race condition of <code>responseMap</code> in
+ <code>RpcChannel</code>. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="jdbc-pool">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org