Author: markt Date: Fri Jul 4 06:31:45 2008 New Revision: 674051 URL: http://svn.apache.org/viewvc?rev=674051&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212 Map.entrySet() should return entries, not values
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674051&r1=674050&r2=674051&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 06:31:45 2008 @@ -31,13 +31,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212 - Map.entrySet() should return entries, not values - http://svn.apache.org/viewvc?rev=668849&view=rev - +1: markt, fhanik, jfclere - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36155 Port the fix from the JK Connector to the AJP and APR Connectors http://svn.apache.org/viewvc?rev=672454&view=rev @@ -70,5 +63,5 @@ <arg value="tomcat.nsi" /> </exec> - +1: remm, jfclere + +1: remm, jfclere, markt -1: 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?rev=674051&r1=674050&r2=674051&view=diff ============================================================================== --- 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 Fri Jul 4 06:31:45 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); } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=674051&r1=674050&r2=674051&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jul 4 06:31:45 2008 @@ -389,6 +389,10 @@ </subsection> <subsection name="Cluster"> <changelog> + <fix> + <bug>45212</bug>: AbstractReplicatedMap.entrySet() now returns entries + rather than vaules. (markt) + </fix> <fix><bug>45279</bug>Properly close multicast socket.</fix> <update> Fix session replication dead lock during non sticky load balancing. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]