Author: remm
Date: Tue Jul 17 10:59:37 2018
New Revision: 1836102
URL: http://svn.apache.org/viewvc?rev=1836102&view=rev
Log:
Revert as the membership service gets a heartbeat if it is added as a listener
on the group channel.
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=1836102&r1=1836101&r2=1836102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue
Jul 17 10:59:37 2018
@@ -188,10 +188,6 @@ public class GroupChannel extends Channe
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=1836102&r1=1836101&r2=1836102&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 17 10:59:37 2018
@@ -70,9 +70,6 @@
<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
