Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 15650 invoked from network); 1 Jul 2009 19:16:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Jul 2009 19:16:26 -0000 Received: (qmail 77377 invoked by uid 500); 1 Jul 2009 19:16:36 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 77264 invoked by uid 500); 1 Jul 2009 19:16:36 -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 77253 invoked by uid 99); 1 Jul 2009 19:16:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 19:16:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 19:16:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC857238888E; Wed, 1 Jul 2009 19:16:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790321 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt Date: Wed, 01 Jul 2009 19:16:13 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090701191613.DC857238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Wed Jul 1 19:16:13 2009 New Revision: 790321 URL: http://svn.apache.org/viewvc?rev=790321&view=rev Log: Partial fix for BZ 46990: Synchronization issues in cluster membership reported by FindBugs. Patch provided by Sebb. Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java?rev=790321&r1=790320&r2=790321&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java Wed Jul 1 19:16:13 2009 @@ -38,6 +38,8 @@ { protected static final McastMember[] EMPTY_MEMBERS = new McastMember[0]; + private final Object membersLock = new Object(); + /** * The name of this membership, has to be the same as the name for the local * member @@ -113,7 +115,7 @@ * @param member The member to add */ protected void addMcastMember(McastMember member) { - synchronized (members) { + synchronized (membersLock) { McastMember results[] = new McastMember[members.length + 1]; for (int i = 0; i < members.length; i++) @@ -130,7 +132,7 @@ * @param member The member to remove */ protected void removeMcastMember(McastMember member) { - synchronized (members) { + synchronized (membersLock) { int n = -1; for (int i = 0; i < members.length; i++) { if (members[i] == member) { Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790321&r1=790320&r2=790321&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 1 19:16:13 2009 @@ -215,25 +215,29 @@ - - + + + 46990: Fix synchronization issues in cluster membership + reported by FindBugs. Patch provided by Sebb. (markt, rjung) + + 47389: DeltaManager doesn't do session replication if notifySessionListenersOnReplication=false. Patch by Keiichi Fujino. (fhanik, rjung) - - + + Separate statistics counter lock in FastAsyncSocketSender from inherited DataSender lock to reduce blocking during failed node detection. (rjung) - - + + Handle situation session ID rewriting on fail-over with parallel requests from the same client. (pero) - - + + 43641: Use of bind attribute for membership element breaks multicast. (rjung) - - + + Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790321&r1=790320&r2=790321&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 19:16:13 2009 @@ -60,13 +60,6 @@ -1: markt - For the common and combined pattern in ALV there is no space between %t and %r For the common and combined pattern in ALV the %r has no opening quote, only the closing quote -* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46990 - Improve locking in cluster membership. - Backport of http://svn.apache.org/viewvc?view=rev&revision=771009 from tc6 - resp. http://svn.apache.org/viewvc?view=rev&revision=789826 from OACC. - +1: rjung, kkolinko, markt - -1: - * Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45447 Add spanish message translations. Backport of http://svn.apache.org/viewvc?view=rev&revision=698924 from tc6 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org