2 files changed, 64 insertions, 63 deletions
diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index e47cd1d..6278414 100644
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -36,33 +36,34 @@ public final class Locale implements java.io.Serializable, Cloneable
 
   public Locale (String languageCode, String countryCode)
   {
-    language = languageCode.toLowerCase();
-    country = countryCode.toUpperCase();
-    hashcode = languageCode.hashCode() ^ countryCode.hashCode();
+    this (languageCode, countryCode, "");
   }
 
   public Locale (String languageCode, String countryCode,
 		 String variantCode)
   {
-    this (languageCode, countryCode);
-    variant = variantCode;
-    hashcode ^= variantCode.hashCode();
+    // We must explicitly check the arguments.
+    if (languageCode == null || countryCode == null
+	|| variantCode == null)
+      throw new NullPointerException ();
+    language = languageCode.toLowerCase();
+    country = countryCode.toUpperCase();
+    variant = variantCode.toUpperCase();
+    hashcode = (languageCode.hashCode()
+		^ countryCode.hashCode()
+		^ variantCode.hashCode());
   }
 
   public Object clone ()
-    {
-      return (Object) new Locale (language, country, variant);
-    }
+  {
+    return (Object) new Locale (language, country, variant);
+  }
 
   public boolean equals (Object obj)
     {
       if (! (obj instanceof Locale))
 	return false;
       Locale loc = (Locale) obj;
-      if ((language == null && loc.language != null)
-	  || (country == null && loc.country != null)
-	  || (variant == null && loc.variant != null))
-	return false;
       return (language.equals(loc.language)
 	      && country.equals(loc.country)
 	      && variant.equals(loc.variant));
@@ -115,7 +116,7 @@ public final class Locale implements java.io.Serializable, Cloneable
     result.append(language);
     result.append('_');
     result.append(country);
-    if (variant != null && variant.length() > 0)
+    if (variant.length() > 0)
       {
 	result.append('_');
 	result.append(variant);
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index ba1d3f9..05503c6 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -20,6 +20,9 @@ public abstract class ResourceBundle
 {
   protected ResourceBundle parent;
 
+  // This is used to cache resource bundles.
+  private static Hashtable resource_cache = new Hashtable ();
+
   public ResourceBundle ()
     {
     }
@@ -65,15 +68,17 @@ public abstract class ResourceBundle
 							String stopHere)
     {
       Class rbc;
+      ResourceBundle needs_parent = null, r, result = null;
 
       while (true)
 	{
 	  try 
 	    {
 	      rbc = Class.forName(bundleName);
+	      r = null;
 	      try 
 		{
-		  return (ResourceBundle) rbc.newInstance();
+		  r = (ResourceBundle) rbc.newInstance();
 		}
 	      catch (IllegalAccessException ex)
 		{
@@ -83,45 +88,61 @@ public abstract class ResourceBundle
 		{
 		  // Fall through
 		}
-	      return null;
+	      if (r != null)
+		{
+		  if (result == null)
+		    result = r;
+		  if (needs_parent != null)
+		    {
+		      // We've been through the loop one or more times
+		      // already.  Set the parent and keep going.
+		      needs_parent.setParent(r);
+		    }
+		  needs_parent = r;
+		}
 	    }
 	  catch (ClassNotFoundException ex)
 	    {
-	      if (bundleName.compareTo(stopHere) == 0)
-		return null;
-	      else
-		{
-		  int last = bundleName.lastIndexOf('_');
-		  
-		  // No more underscores?
-		  if (last == -1)
-		    return null;
+	      // Fall through.
+	    }
+
+	  if (bundleName.equals(stopHere))
+	    return result;
+	  else
+	    {
+	      int last = bundleName.lastIndexOf('_');
 		  
-		  // Loop around, testing this new shorter name.
-		  bundleName = bundleName.substring(0, last);
-		}
+	      // No more underscores?
+	      if (last == -1)
+		return result;
+
+	      // Loop around, testing this new shorter name.
+	      bundleName = bundleName.substring(0, last);
 	    }
 	}
     }
-  
-  // Search for bundles, but stop at baseName_language.
-  private static final ResourceBundle partialGetBundle (String baseName,
-							Locale locale)
+
+  // Search for bundles, but stop at baseName_language (if required).
+  // This is synchronized so that the cache works correctly.
+  private static final synchronized ResourceBundle
+    partialGetBundle (String baseName, Locale locale, boolean langStop)
     {
       ResourceBundle rb;
 
-      String bundleName = (baseName 
-			   + "_" 
-			   + locale.getLanguage() + "_"
-			   + locale.getCountry() + "_"
-			   + locale.getVariant());
+      String bundleName = baseName + "_" + locale;
+
+      // Check the cache.
+      Object obj = resource_cache.get(bundleName);
+      if (obj != null)
+	return (ResourceBundle) obj;
 
       String stopHere = (baseName 
-			 + "_" 
-			 + locale.getLanguage());
+			 + (langStop ? ("_" + locale.getLanguage()) : ""));
 
 
       rb = trySomeGetBundle(bundleName, stopHere);
+      if (rb != null)
+	resource_cache.put(bundleName, rb);
 
       return rb;
     }
@@ -138,39 +159,18 @@ public abstract class ResourceBundle
       if (locale == null)
 	throw new NullPointerException ();
 
-      rb = partialGetBundle(baseName, locale);
+      rb = partialGetBundle(baseName, locale, false);
       if (rb != null)
 	return rb;
 
+      // Finally, try the default locale.
       if (! locale.equals(Locale.getDefault()))
 	{
-	  rb = partialGetBundle(baseName, Locale.getDefault());
+	  rb = partialGetBundle(baseName, Locale.getDefault(), true);
 	  if (rb != null)
 	    return rb;
 	}
 			   
-      // Try just the baseName.
-      try
-	{
-	  rbc = Class.forName (baseName);
-	  try 
-	    {
-	      return (ResourceBundle) rbc.newInstance();
-	    }
-	  catch (IllegalAccessException ex)
-	    {
-	      // Fall through.
-	    }
-	  catch (InstantiationException ex)
-	    {
-	      // Fall through.
-	    }
-	}
-      catch (ClassNotFoundException ex)
-	{
-	  // Fall through.
-	}
-
       throw new MissingResourceException("can't load bundle", 
 					 baseName,
 					 "bundle");