This is an automated email from the ASF dual-hosted git repository.

kfujino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new b13281e  Ensure that members registered in the addSuspects list are 
static members.
b13281e is described below

commit b13281e7f63e15590adfbf4fbd19493c55cd10a4
Author: kfujino <kfuj...@apache.org>
AuthorDate: Tue Mar 5 16:39:24 2019 +0900

    Ensure that members registered in the addSuspects list are static
    members.
---
 .../apache/catalina/tribes/group/interceptors/TcpFailureDetector.java | 4 +++-
 webapps/docs/changelog.xml                                            | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java 
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 2253d4a..281ee4d 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -134,7 +134,9 @@ public class TcpFailureDetector extends 
ChannelInterceptorBase implements TcpFai
                     addSuspects.remove(member);
                     notify = true;
                 } else {
-                    addSuspects.put(member, 
Long.valueOf(System.currentTimeMillis()));
+                    if (member instanceof StaticMember) {
+                        addSuspects.put(member, 
Long.valueOf(System.currentTimeMillis()));
+                    }
                 }
             }
         }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 279096a..431b57c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
         Add feature that discover local member from the static member list.
         (kfujino)
       </add>
+      <fix>
+        Ensure that members registered in the addSuspects list are static
+        members. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">


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

Reply via email to