Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 99996 invoked from network); 3 May 2006 16:54:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2006 16:54:51 -0000 Received: (qmail 881 invoked by uid 500); 3 May 2006 16:54:45 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 837 invoked by uid 500); 3 May 2006 16:54:44 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 826 invoked by uid 500); 3 May 2006 16:54:44 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 823 invoked by uid 99); 3 May 2006 16:54:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 09:54:44 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 May 2006 09:54:43 -0700 Received: (qmail 99809 invoked by uid 65534); 3 May 2006 16:54:23 -0000 Message-ID: <20060503165423.99767.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399350 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: group/interceptors/TcpFailureDetector.java membership/Membership.java Date: Wed, 03 May 2006 16:54:19 -0000 To: tomcat-dev@jakarta.apache.org From: fhanik@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: fhanik Date: Wed May 3 09:54:15 2006 New Revision: 399350 URL: http://svn.apache.org/viewcvs?rev=399350&view=rev Log: fixed some small code issues 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/Membership.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=399350&r1=399349&r2=399350&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 Wed May 3 09:54:15 2006 @@ -189,6 +189,7 @@ data.setTimestamp(System.currentTimeMillis()); int options = getOptionFlag() | Channel.SEND_OPTIONS_BYTE_MESSAGE; if ( performReadTest ) options = (options | Channel.SEND_OPTIONS_USE_ACK); + else options = (options & (~Channel.SEND_OPTIONS_USE_ACK)); data.setOptions(options); byte[] message = XByteBuffer.createDataPackage(data); socket.getOutputStream().write(message); Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Membership.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Membership.java?rev=399350&r1=399349&r2=399350&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Membership.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Membership.java Wed May 3 09:54:15 2006 @@ -92,9 +92,7 @@ //return true if the membership has changed MbrEntry entry = (MbrEntry)map.get(member); if ( entry == null ) { - entry = new MbrEntry(member); - map.put(member,entry); - addMember(member); + entry = addMember(member); result = true; } else { //update the member alive time @@ -113,15 +111,16 @@ * Add a member to this component and sort array with memberComparator * @param member The member to add */ - public void addMember(MemberImpl member) { + public synchronized MbrEntry addMember(MemberImpl member) { synchronized (members) { - MemberImpl results[] = - new MemberImpl[members.length + 1]; - for (int i = 0; i < members.length; i++) - results[i] = members[i]; + MbrEntry entry = new MbrEntry(member); + map.put(member,entry); + MemberImpl results[] = new MemberImpl[members.length + 1]; + for (int i = 0; i < members.length; i++) results[i] = members[i]; results[members.length] = member; members = results; Arrays.sort(members, memberComparator); + return entry; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org