From 90e660c368758ce00076e1ca10443b74b96ca8df Mon Sep 17 00:00:00 2001 From: fhanik Date: Tue, 3 Jul 2007 13:31:05 +0000 Subject: [PATCH] BZ 42803 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@552838 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index 2e097f50a..573a6d73c 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -986,11 +986,11 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements //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; -- 2.11.0