This is an automated email from the ASF dual-hosted git repository.
kfujino pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 075985c Ensure that members registered in the addSuspects list are
static members.
075985c is described below
commit 075985c5169f6e4623719e0f26064d723dd4075e
Author: kfujino <kfuj...@apache.org>
AuthorDate: Tue Mar 5 17:08:24 2019 +0900
Ensure that members registered in the addSuspects list are static
members.
---
.../catalina/tribes/group/interceptors/TcpFailureDetector.java | 4 +++-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 11 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 d805fe7..2220f20 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -133,7 +133,9 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
membership.memberAlive(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 2a9fe56..2ef5914 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,6 +182,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ Ensure that members registered in the addSuspects list are static
+ members. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
