Author: kfujino
Date: Tue Jun 21 06:23:21 2016
New Revision: 1749449
URL: http://svn.apache.org/viewvc?rev=1749449&view=rev
Log:
If the ping message has been received at the AbstractReplicatedMap#leftOver
method, ensure that notify the member is alive than ignore it.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1749449&r1=1749448&r2=1749449&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jun 21 06:23:21 2016
@@ -614,7 +614,8 @@ public abstract class AbstractReplicated
mapmsg.deserialize(getExternalLoaders());
if (mapmsg.getMsgType() == MapMessage.MSG_START) {
mapMemberAdded(mapmsg.getPrimary());
- } else if (mapmsg.getMsgType() == MapMessage.MSG_INIT) {
+ } else if (mapmsg.getMsgType() == MapMessage.MSG_INIT
+ || mapmsg.getMsgType() == MapMessage.MSG_PING) {
memberAlive(mapmsg.getPrimary());
} else {
// other messages are ignored.
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1749449&r1=1749448&r2=1749449&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jun 21 06:23:21 2016
@@ -82,6 +82,11 @@
<add>
Add log message when the ping has timed-out. (kfujino)
</add>
+ <fix>
+ If the ping message has been received at the
+ <code>AbstractReplicatedMap#leftOver</code> method, ensure that notify
+ the member is alive than ignore it. (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
