fix heartbeat

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@532429 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
index c185f4e..09fea97 100644 (file)
--- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
@@ -275,7 +275,7 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
         this.membershipService.setMembershipListener(this);
     }
     
-    public void hearbeat() {
+    public void heartbeat() {
         if ( clusterSender!=null ) clusterSender.heartbeat();
         super.heartbeat();
     }

diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index b7dada9..37a66f9 100644 (file)
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -184,6 +184,7 @@ public class TcpFailureDetector extends ChannelInterceptorBase {
     }
     
     public void heartbeat() {
+        super.heartbeat();
         checkMembers(false);
     }
     public void checkMembers(boolean checkAll) {

diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index df1a030..04065c7 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -106,7 +106,7 @@ public class ReplicationTransmitter implements ChannelSender {
      */
 
     public void heartbeat() {
-        
+        if (getTransport()!=null) getTransport().keepalive();
     }
 
     /**