[commit-cp] classpath ChangeLog java/util/Collections.java [generics-branch]

[Jeroen Frijters]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Branch:         generics-branch
Changes by:     Jeroen Frijters <jfrijters>     06/06/21 11:38:48

Modified files:
        .              : ChangeLog 
        java/util      : Collections.java 

Log message:
        2006-06-21  Jeroen Frijters  <[EMAIL PROTECTED]>
        
                * java/util/Collections (entrySet): Fixed compile error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.275&r2=1.2386.2.276
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Collections.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.28.2.22&r2=1.28.2.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.275
retrieving revision 1.2386.2.276
diff -u -b -r1.2386.2.275 -r1.2386.2.276
--- ChangeLog   17 Jun 2006 15:42:59 -0000      1.2386.2.275
+++ ChangeLog   21 Jun 2006 11:38:46 -0000      1.2386.2.276
@@ -1,3 +1,7 @@
+2006-06-21  Jeroen Frijters  <[EMAIL PROTECTED]>
+
+       * java/util/Collections (entrySet): Fixed compile error.
+
 2006-06-17  Tom Tromey  <[EMAIL PROTECTED]>
 
        * lib/gen-classlist.sh.in: Search all top-level directories, not

Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.28.2.22
retrieving revision 1.28.2.23
diff -u -b -r1.28.2.22 -r1.28.2.23
--- java/util/Collections.java  11 Jun 2006 18:23:24 -0000      1.28.2.22
+++ java/util/Collections.java  21 Jun 2006 11:38:48 -0000      1.28.2.23
@@ -6619,7 +6619,7 @@
       if (entries == null)
        {
          Class<Map.Entry<K,V>> klass =
-           (Class<Map.Entry<K,V>>) Map.Entry.class;
+           (Class<Map.Entry<K,V>>) (Class) Map.Entry.class;
          entries = new CheckedEntrySet<Map.Entry<K,V>,K,V>(m.entrySet(),
                                                            klass,
                                                            keyType,