Author: fhanik Date: Wed Apr 25 11:03:18 2007 New Revision: 532429 URL: http://svn.apache.org/viewvc?view=rev&rev=532429 Log: fix heartbeat
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?view=diff&rev=532429&r1=532428&r2=532429 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java Wed Apr 25 11:03:18 2007 @@ -275,7 +275,7 @@ this.membershipService.setMembershipListener(this); } - public void hearbeat() { + public void heartbeat() { if ( clusterSender!=null ) clusterSender.heartbeat(); super.heartbeat(); } Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?view=diff&rev=532429&r1=532428&r2=532429 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Wed Apr 25 11:03:18 2007 @@ -184,6 +184,7 @@ } public void heartbeat() { + super.heartbeat(); checkMembers(false); } public void checkMembers(boolean checkAll) { Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?view=diff&rev=532429&r1=532428&r2=532429 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Wed Apr 25 11:03:18 2007 @@ -106,7 +106,7 @@ */ public void heartbeat() { - + if (getTransport()!=null) getTransport().keepalive(); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]