Author: remm
Date: Mon Dec 17 17:28:35 2018
New Revision: 1849114
URL: http://svn.apache.org/viewvc?rev=1849114&view=rev
Log:
Never expire a local member from the membership object.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1849114&r1=1849113&r2=1849114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Mon
Dec 17 17:28:35 2018
@@ -343,8 +343,7 @@ public class Membership implements Clone
* <code>false</code>
*/
public boolean hasExpired(long maxtime) {
- long delta = System.currentTimeMillis() - lastHeardFrom;
- return delta > maxtime;
+ return !mbr.isLocal() && (System.currentTimeMillis() -
lastHeardFrom) > maxtime;
}
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1849114&r1=1849113&r2=1849114&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 17 17:28:35 2018
@@ -79,6 +79,9 @@
than getting the pod list but it does not indicate pod status.
Submitted by by Maxime Beck. (remm)
</update>
+ <fix>
+ Never expire the local member from a Membership. (remm)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
