Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 23303 invoked from network); 3 Jul 2007 13:30:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jul 2007 13:30:19 -0000 Received: (qmail 38436 invoked by uid 500); 3 Jul 2007 13:30:08 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 38395 invoked by uid 500); 3 Jul 2007 13:30:08 -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 38366 invoked by uid 500); 3 Jul 2007 13:30:08 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 38283 invoked by uid 99); 3 Jul 2007 13:30:07 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2007 06:30:07 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2007 06:30:04 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EB1DD1A981D; Tue, 3 Jul 2007 06:29:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r552836 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Date: Tue, 03 Jul 2007 13:29:43 -0000 To: tomcat-dev@jakarta.apache.org From: fhanik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070703132943.EB1DD1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fhanik Date: Tue Jul 3 06:29:43 2007 New Revision: 552836 URL: http://svn.apache.org/viewvc?view=rev&rev=552836 Log: Fix BZ 42803 Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=552836&r1=552835&r2=552836 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jul 3 06:29:43 2007 @@ -986,11 +986,11 @@ //only count active members in this node int counter = 0; Iterator it = super.entrySet().iterator(); - while (it.hasNext() ) { + while (it!=null && it.hasNext() ) { Map.Entry e = (Map.Entry) it.next(); if ( e != null ) { MapEntry entry = (MapEntry) super.get(e.getKey()); - if (entry.isPrimary() && entry.getValue() != null) counter++; + if (entry!=null && entry.isPrimary() && entry.getValue() != null) counter++; } } return counter; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org