You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2008/05/25 08:48:43 UTC
svn commit: r659929 -
/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Author: azeez
Date: Sat May 24 23:48:42 2008
New Revision: 659929
URL: http://svn.apache.org/viewvc?rev=659929&view=rev
Log:
Do not add the localmember to the member list
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?rev=659929&r1=659928&r2=659929&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java Sat May 24 23:48:42 2008
@@ -202,9 +202,11 @@
member.setPayload("ping".getBytes());
membershipManager.removeWellKnownMember(wkaMember);
staticMembershipInterceptor.removeStaticMember(wkaMember);
- membershipManager.addWellKnownMember(member);
- membershipManager.memberAdded(member);
- staticMembershipInterceptor.memberAdded(member);
+ if (!membershipManager.getLocalMember().equals(member)) {
+ membershipManager.addWellKnownMember(member);
+ membershipManager.memberAdded(member);
+ staticMembershipInterceptor.memberAdded(member);
+ }
log.info("Sending MEMBER_JOINED to group...");
MemberJoinedCommand memberJoinedCommand = new MemberJoinedCommand();
@@ -581,6 +583,8 @@
// Add a reliable failure detector
TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
tcpFailureDetector.setPrevious(dfi);
+ tcpFailureDetector.setReadTestTimeout(30000);
+ tcpFailureDetector.setConnectTimeout(30000);
channel.addInterceptor(tcpFailureDetector);
if (membershipScheme.equals(ClusteringConstants.MembershipScheme.WKA_BASED)) {