Author: remm
Date: Fri Jul 13 12:56:42 2018
New Revision: 1835831
URL: http://svn.apache.org/viewvc?rev=1835831&view=rev
Log:
Propagate heartbeat from channel down to membership service.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1835831&r1=1835830&r2=1835831&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Fri
Jul 13 12:56:42 2018
@@ -187,6 +187,11 @@ public class GroupChannel extends Channe
@Override
public void heartbeat() {
super.heartbeat();
+
+ if (coordinator.getMembershipService() instanceof Heartbeat) {
+ ((Heartbeat) coordinator.getMembershipService()).heartbeat();
+ }
+
for (MembershipListener listener : membershipListeners) {
if ( listener instanceof Heartbeat )
((Heartbeat)listener).heartbeat();
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1835831&r1=1835830&r2=1835831&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 13 12:56:42 2018
@@ -70,6 +70,9 @@
<bug>62527</bug>: Revert restriction of JNDI to the <code>java:</code>
namespace. (remm)
</fix>
+ <fix>
+ Propagate heartbeat from channel down to membership service. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
