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 2015/11/24 07:16:55 UTC
svn commit: r1716038 - in /tomcat/trunk:
java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
webapps/docs/changelog.xml
Author: kfujino
Date: Tue Nov 24 06:16:54 2015
New Revision: 1716038
URL: http://svn.apache.org/viewvc?rev=1716038&view=rev
Log:
Ensure that the static member is registered to the add suspect list even If the static member that is registered to the remove suspect list has disappeared.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1716038&r1=1716037&r2=1716038&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Tue Nov 24 06:16:54 2015
@@ -277,6 +277,9 @@ public class TcpFailureDetector extends
Member m = keys[i];
if (membership.getMember(m) != null && (!memberAlive(m))) {
membership.removeMember(m);
+ if (m instanceof StaticMember) {
+ addSuspects.put(m, Long.valueOf(System.currentTimeMillis()));
+ }
super.memberDisappeared(m);
removeSuspects.remove(m);
if(log.isInfoEnabled())
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716038&r1=1716037&r2=1716038&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 24 06:16:54 2015
@@ -126,6 +126,15 @@
</add>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ Ensure that the static member is registered to the add suspect list even
+ if the static member that is registered to the remove suspect list has
+ disappeared. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="jdbc-pool">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org