[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: LinkedHashMap fix

Kaffe CVS cvs-commits at kaffe.org
Sat Feb 19 10:02:31 PST 2005


PatchSet 5575 
Date: 2005/02/19 17:50:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with  GNU Classpath: LinkedHashMap fix

2005-02-19  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-02-18  Bryce McKinlay  <mckinlay at redhat.com>

* java/util/LinkedHashMap (addEntry): Call remove() with key argument,
not the HashEntry. Reported by Jean-Marie White.

Members: 
	ChangeLog:1.3619->1.3620 
	libraries/javalib/java/util/LinkedHashMap.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3619 kaffe/ChangeLog:1.3620
--- kaffe/ChangeLog:1.3619	Sat Feb 19 17:37:40 2005
+++ kaffe/ChangeLog	Sat Feb 19 17:50:06 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 	
+	2005-02-18  Bryce McKinlay  <mckinlay at redhat.com>
+
+	* java/util/LinkedHashMap (addEntry): Call remove() with key argument, 
+	not the HashEntry. Reported by Jean-Marie White.
+	
+2005-02-19  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+	
 	2005-02-18  Sven de Marothy <sven at physto.se>
 
 	* java/util/TimeZone.java,
Index: kaffe/libraries/javalib/java/util/LinkedHashMap.java
diff -u kaffe/libraries/javalib/java/util/LinkedHashMap.java:1.1 kaffe/libraries/javalib/java/util/LinkedHashMap.java:1.2
--- kaffe/libraries/javalib/java/util/LinkedHashMap.java:1.1	Tue Aug 12 23:02:19 2003
+++ kaffe/libraries/javalib/java/util/LinkedHashMap.java	Sat Feb 19 17:50:11 2005
@@ -412,7 +412,7 @@
     e.next = buckets[idx];
     buckets[idx] = e;
     if (callRemove && removeEldestEntry(root))
-      remove(root);
+      remove(root.key);
   }
 
   /**




More information about the kaffe mailing list