aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorBryce McKinlay <mckinlay@redhat.com>2005-02-19 03:18:20 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2005-02-19 03:18:20 +0000
commite863ccf3286cb6d200eca1917b72e485aca71a26 (patch)
treec0e332ad811a27638c7aa5c8b36f0e0bfdb20e92 /libjava
parent396090773cfa29f9a5973a39a61dfc8d001b9633 (diff)
downloadgcc-e863ccf3286cb6d200eca1917b72e485aca71a26.zip
gcc-e863ccf3286cb6d200eca1917b72e485aca71a26.tar.gz
gcc-e863ccf3286cb6d200eca1917b72e485aca71a26.tar.bz2
LinkedHashMap (addEntry): Call remove() with key argument, not the HashEntry.
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. From-SVN: r95263
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/LinkedHashMap.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a81a389..808f527 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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 Tom Tromey <tromey@redhat.com>
PR java/20056:
diff --git a/libjava/java/util/LinkedHashMap.java b/libjava/java/util/LinkedHashMap.java
index 0a8484b..f58cf3f 100644
--- a/libjava/java/util/LinkedHashMap.java
+++ b/libjava/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);
}
/**