Apply Filip's better patch for https://issues.apache.org/bugzilla/show_bug.cgi?id...

Map.entrySet() should return entries, not values

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@668849 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 0ef1d0c..08187c2 100644 (file)
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -1017,7 +1017,9 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                 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(new MapEntry(key, entry.getValue()));
+                }
             }
             return Collections.unmodifiableSet(set);
         }