Author: kfujino
Date: Wed Jan 28 06:04:58 2015
New Revision: 1655224
URL: http://svn.apache.org/r1655224
Log:
Fix a possible deadlock when receiver thread invokes mapMemberAdded() while
ping thread invokes memberAlive().
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1655224&r1=1655223&r2=1655224&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 28 06:04:58 2015
@@ -300,10 +300,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()));
}
}
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=1655224&r1=1655223&r2=1655224&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 06:04:58 2015
@@ -55,6 +55,17 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 7.0.59 (violetagg)">
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ Fix a possible deadlock when receiver thread invokes
+ <code>mapMemberAdded()</code> while ping thread invokes
+ <code>memberAlive()</code>. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 7.0.58 (violetagg)">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
