From a021fbf38d9d13a1966a8ced9ea03b8d2f742406 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 19 Feb 2005 03:15:35 +0000 Subject: 2005-02-18 Bryce McKinlay * java/util/LinkedHashMap (addEntry): Call remove() with key argument, not the HashEntry. Reported by Jean-Marie White. --- ChangeLog | 6 ++++++ java/util/LinkedHashMap.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b57a85a60..81465c66e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-18 Bryce McKinlay + + * java/util/LinkedHashMap (addEntry): Call remove() with key argument, + not the HashEntry. Reported by Jean-Marie White. + 2005-02-18 Mark Wielaard * doc/www.gnu.org/events/escape_fosdem05.wml: New event. @@ -88,6 +93,7 @@ Reformatted. (readConfiguration): If a logger for a key is not found, create one. +>>>>>>> 1.3227 2005-02-16 Michael Koch * scripts/checkstyle-config.xml: Activate JavadocStyle and diff --git a/java/util/LinkedHashMap.java b/java/util/LinkedHashMap.java index 0a8484bae..f58cf3fe7 100644 --- a/java/util/LinkedHashMap.java +++ b/java/util/LinkedHashMap.java @@ -412,7 +412,7 @@ public class LinkedHashMap extends HashMap e.next = buckets[idx]; buckets[idx] = e; if (callRemove && removeEldestEntry(root)) - remove(root); + remove(root.key); } /** -- cgit v1.2.1