diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2005-02-19 03:15:35 +0000 |
|---|---|---|
| committer | Bryce McKinlay <mckinlay@redhat.com> | 2005-02-19 03:15:35 +0000 |
| commit | a021fbf38d9d13a1966a8ced9ea03b8d2f742406 (patch) | |
| tree | b5f7d9b0b303141dd8e7caf09b9ce7b9ba4cf913 | |
| parent | fc613c8b1dcbf40ff0ee813bb18ebf09acab3eb2 (diff) | |
| download | classpath-a021fbf38d9d13a1966a8ced9ea03b8d2f742406.tar.gz | |
2005-02-18 Bryce McKinlay <mckinlay@redhat.com>
* java/util/LinkedHashMap (addEntry): Call remove() with key argument,
not the HashEntry. Reported by Jean-Marie White.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/util/LinkedHashMap.java | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-02-18 Bryce McKinlay <mckinlay@redhat.com> + + * java/util/LinkedHashMap (addEntry): Call remove() with key argument, + not the HashEntry. Reported by Jean-Marie White. + 2005-02-18 Mark Wielaard <mark@klomp.org> * 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 <konqueror@gmx.de> * 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); } /** |