From: Bryce McKinlay <mckinlay@redhat.com>
Date: Thu, 25 Nov 2004 19:20:17 +0000 (+0000)
Subject: ResourceBundle.java (BundleKey): Don't implement Cloneable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5257260c2bac40d3691c6054520d52aced302b65;p=gcc.git

ResourceBundle.java (BundleKey): Don't implement Cloneable.

2004-11-25  Bryce McKinlay  <mckinlay@redhat.com>

	* java/util/ResourceBundle.java (BundleKey): Don't implement
	Cloneable.
	(BundleKey.clone): Removed.
	(getBundle): Copy BundleKey using constructor, not clone().

From-SVN: r91304
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1de7a726d17..1f26c2b6b26 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-25  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* java/util/ResourceBundle.java (BundleKey): Don't implement
+	Cloneable.
+	(BundleKey.clone): Removed.
+	(getBundle): Copy BundleKey using constructor, not clone().
+
 2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool reversion.
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.