Author: markt
Date: Mon Jun 16 10:22:36 2008
New Revision: 668249
URL: http://svn.apache.org/viewvc?rev=668249&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values
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?rev=668249&r1=668248&r2=668249&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Jun 16 10:22:36 2008
@@ -1017,7 +1017,7 @@
Map.Entry e = (Map.Entry)i.next();
Object key = e.getKey();
MapEntry entry = (MapEntry)super.get(key);
- if ( entry != null && entry.isPrimary() )
set.add(entry.getValue());
+ if ( entry != null && entry.isPrimary() ) set.add(entry);
}
return Collections.unmodifiableSet(set);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
