From 78d608e8bd7e417f8aa0f3e193d1a8624dd0424e Mon Sep 17 00:00:00 2001 From: bryce Date: Thu, 25 Nov 2004 19:20:17 +0000 Subject: 2004-11-25 Bryce McKinlay * java/util/ResourceBundle.java (BundleKey): Don't implement Cloneable. (BundleKey.clone): Removed. (getBundle): Copy BundleKey using constructor, not clone(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91304 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/ResourceBundle.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index 94acc9688e0..57a9bfc7dc7 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -244,7 +244,7 @@ public abstract class ResourceBundle /** Cache key for the ResourceBundle cache. Resource bundles are keyed by the combination of bundle name, locale, and class loader. */ - private static class BundleKey implements Cloneable + private static class BundleKey { String baseName; Locale locale; @@ -281,18 +281,6 @@ public abstract class ResourceBundle baseName.equals(key.baseName) && locale.equals(key.locale) && classLoader.equals(key.classLoader); - } - - public Object clone() - { - Object clone = null; - try - { - clone = super.clone(); - } - catch (CloneNotSupportedException x) {} - - return clone; } } @@ -417,7 +405,7 @@ public abstract class ResourceBundle if (bundle == null && !locale.equals(defaultLocale)) bundle = tryBundle(baseName, defaultLocale, classLoader, true); - BundleKey key = (BundleKey) lookupKey.clone(); + BundleKey key = new BundleKey(baseName, locale, classLoader); if (bundle == null) { // Cache the fact that this lookup has previously failed. -- cgit v1.2.3