tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r668849 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Date Tue, 17 Jun 2008 22:04:51 GMT
Author: markt
Date: Tue Jun 17 15:04:50 2008
New Revision: 668849

URL: http://svn.apache.org/viewvc?rev=668849&view=rev
Log:
Apply Filip's better patch for 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=668849&r1=668848&r2=668849&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jun
17 15:04:50 2008
@@ -1017,7 +1017,9 @@
                 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);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message