Author: kfujino
Date: Wed Jan 28 05:59:49 2015
New Revision: 1655222
URL: http://svn.apache.org/r1655222
Log:
Fix a possible deadlock when receiver thread invokes mapMemberAdded() while
ping thread invokes memberAlive().
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1655222&r1=1655221&r2=1655222&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 28 05:59:49 2015
@@ -293,10 +293,8 @@ public abstract class AbstractReplicated
* @param member Member
*/
protected void memberAlive(Member member) {
+ mapMemberAdded(member);
synchronized (mapMembers) {
- if (!mapMembers.containsKey(member)) {
- mapMemberAdded(member);
- } //end if
mapMembers.put(member, new Long(System.currentTimeMillis()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
