diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-18 15:40:16 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-18 15:40:16 +0000 |
| commit | 0662d7053a08078b08d9cca058714f14f3f2fbcd (patch) | |
| tree | 6b8dcd38b7dbb7c4c618080eb1958b6f042d581c /libjava/java/util/TreeMap.java | |
| parent | 23266d1bf15afc4361ed8af5eeee636790929b35 (diff) | |
| download | ppe42-gcc-0662d7053a08078b08d9cca058714f14f3f2fbcd.tar.gz ppe42-gcc-0662d7053a08078b08d9cca058714f14f3f2fbcd.zip | |
* gcj/javaprims.h: Updated class declaration list.
* Makefile.in: Rebuilt.
* Makefile.am (core_java_source_files): Added
PropertyPermissionCollection.java.
* java/lang/Thread.java (group, name): Now package-private.
* java/lang/ThreadGroup.java: Re-merge with Classpath.
* java/util/AbstractList.java: Likewise.
* java/util/AbstractMap.java: Likewise.
* java/util/Calendar.java: Likewise.
* java/util/Collections.java: Likewise.
* java/util/HashMap.java: Likewise.
* java/util/Hashtable.java: Likewise.
* java/util/LinkedHashMap.java: Likewise.
* java/util/LinkedList.java: Likewise.
* java/util/List.java: Likewise.
* java/util/ListResourceBundle.java: Likewise.
* java/util/Map.java: Likewise.
* java/util/Observable.java: Likewise.
* java/util/Properties.java: Likewise.
* java/util/PropertyPermission.java: Likewise.
* java/util/PropertyPermissionCollection.java: Likewise.
* java/util/PropertyResourceBundle.java: Likewise.
* java/util/Random.java: Likewise.
* java/util/SimpleTimeZone.java: Likewise.
* java/util/StringTokenizer.java: Likewise.
* java/util/TimerTask.java: Likewise.
* java/util/TreeMap.java: Likewise.
* java/util/WeakHashMap.java: Likewise.
* java/util/jar/Attributes.java: Likewise.
* java/util/jar/JarException.java: Likewise.
* java/util/jar/Manifest.java: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54743 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/TreeMap.java')
| -rw-r--r-- | libjava/java/util/TreeMap.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java index 879968233cb..dfa9bc63881 100644 --- a/libjava/java/util/TreeMap.java +++ b/libjava/java/util/TreeMap.java @@ -1,6 +1,6 @@ /* TreeMap.java -- a class providing a basic Red-Black Tree data structure, mapping Object --> Object - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -162,7 +162,7 @@ public class TreeMap extends AbstractMap * * @author Eric Blake <ebb9@email.byu.edu> */ - private static final class Node extends BasicMapEntry + private static final class Node extends AbstractMap.BasicMapEntry { // All fields package visible for use by nested classes. /** The color of this node. */ @@ -623,8 +623,10 @@ public class TreeMap extends AbstractMap Node n = getNode(key); if (n == nil) return null; + // Note: removeNode can alter the contents of n, so save value now. + Object result = n.value; removeNode(n); - return n.value; + return result; } /** @@ -1768,7 +1770,7 @@ public class TreeMap extends AbstractMap SubMap.this.clear(); } }; - return this.keys; + return this.values; } } // class SubMap } // class TreeMap |
