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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
