Author: fhanik
Date: Fri May 19 06:41:04 2006
New Revision: 407796
URL: http://svn.apache.org/viewvc?rev=407796&view=rev
Log:
Minor adjustments
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=407796&r1=407795&r2=407796&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Fri May 19 06:41:04 2006
@@ -14,25 +14,25 @@
*/
package org.apache.catalina.tribes.group.interceptors;
-import org.apache.catalina.tribes.group.ChannelInterceptorBase;
-import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.ChannelMessage;
-import org.apache.catalina.tribes.group.InterceptorPayload;
-import org.apache.catalina.tribes.ChannelException;
-import java.net.Socket;
-import java.net.InetSocketAddress;
import java.net.InetAddress;
-import org.apache.catalina.tribes.Channel;
-import java.util.Arrays;
+import java.net.InetSocketAddress;
+import java.net.Socket;
import java.net.SocketTimeoutException;
-import org.apache.catalina.tribes.io.ChannelData;
-import org.apache.catalina.tribes.io.XByteBuffer;
+import java.util.Arrays;
import java.util.HashMap;
-import org.apache.catalina.tribes.membership.Membership;
-import org.apache.catalina.tribes.membership.MemberImpl;
-import java.util.Iterator;
+
+import org.apache.catalina.tribes.Channel;
+import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelException.FaultyMember;
+import org.apache.catalina.tribes.ChannelMessage;
+import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.RemoteProcessException;
+import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.InterceptorPayload;
+import org.apache.catalina.tribes.io.ChannelData;
+import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.membership.MemberImpl;
+import org.apache.catalina.tribes.membership.Membership;
/**
* <p>Title: A perfect failure detector </p>
@@ -115,12 +115,13 @@
suspect.remove(member);
} else {
//if we add it here, then add it upwards too
- if ( membership.memberAlive((MemberImpl)member))
super.memberAdded(member);
+ if ( memberAlive(member) &&
membership.memberAlive((MemberImpl)member)) super.memberAdded(member);
}
}
public synchronized void memberDisappeared(Member member) {
if ( membership == null ) setupMembership();
+ log.info("Received memberDisappeared["+member+"] message. Will
verify.");
//check to see if the member really is gone
//if the payload is not a shutdown message
if ( !memberAlive(member) ) {
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=407796&r1=407795&r2=407796&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
Fri May 19 06:41:04 2006
@@ -307,7 +307,7 @@
/**
* Send a ping
* @throws Exception
- */
+ */
public void send() throws IOException{
member.inc();
if(log.isDebugEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
