tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r552838 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Date Tue, 03 Jul 2007 13:31:06 GMT
Author: fhanik
Date: Tue Jul  3 06:31:05 2007
New Revision: 552838

URL: http://svn.apache.org/viewvc?view=rev&rev=552838
Log:
BZ 42803

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=552838&r1=552837&r2=552838
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jul
 3 06:31:05 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


Mime
View raw message