From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 25 Apr 2007 18:03:18 +0000 (+0000)
Subject: fix heartbeat
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ab42d9573158713e4618a9ddb1c7ca12ca9f138d;p=tomcat7.0

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 c185f4e74..09fea979a 100644
--- 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 b7dada9b2..37a66f952 100644
--- 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 df1a03048..04065c7e3 100644
--- 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();
     }
 
     /**