diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-02-16 04:50:38 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-02-16 04:50:38 +0000 |
| commit | 3ade9bbaad89deb94535744750ac83091c7a2d23 (patch) | |
| tree | 9a61b7f70b049219578a12f3bc057a4c3b70930a /libjava | |
| parent | fd48c9b5d1d4be67b39b885fcd25809eec077405 (diff) | |
| download | gcc-3ade9bbaad89deb94535744750ac83091c7a2d23.zip gcc-3ade9bbaad89deb94535744750ac83091c7a2d23.tar.gz gcc-3ade9bbaad89deb94535744750ac83091c7a2d23.tar.bz2 | |
HashSet.java (clone): Made subclass safe, use super.clone(), not new.
* java/util/HashSet.java (clone): Made subclass safe, use
super.clone(), not new.
From-SVN: r39746
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/util/HashSet.java | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f3b77a1..51caaa9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -6,6 +6,9 @@ * java/util/TreeMap.java (nil): Made non-final. (clone): Create new nil node for copy. + + * java/util/HashSet.java (clone): Made subclass safe, use + super.clone(), not new. 2001-02-14 Andrew Haley <aph@redhat.com> diff --git a/libjava/java/util/HashSet.java b/libjava/java/util/HashSet.java index c1a5218..228e419 100644 --- a/libjava/java/util/HashSet.java +++ b/libjava/java/util/HashSet.java @@ -45,8 +45,8 @@ import java.io.ObjectOutputStream; * HashSet is a part of the JDK1.2 Collections API. * * @author Jon Zeppieri - * @version $Revision: 1.2 $ - * @modified $Id: HashSet.java,v 1.2 2001/02/14 04:44:21 bryce Exp $ + * @version $Revision: 1.3 $ + * @modified $Id: HashSet.java,v 1.3 2001/02/15 05:12:05 bryce Exp $ */ public class HashSet extends AbstractSet implements Set, Cloneable, Serializable @@ -128,7 +128,14 @@ public class HashSet extends AbstractSet */ public Object clone() { - HashSet copy = new HashSet(); + HashSet copy = null; + try + { + copy = (HashSet) super.clone(); + } + catch (CloneNotSupportedException x) + { + } copy.map = (HashMap) map.clone(); return copy; } |