ResourceBundle.java (partialGetBundle): Explicitly use locale.toString().

	* java/util/ResourceBundle.java (partialGetBundle): Explicitly use
	locale.toString().
	(getBundle): Don't explicitly throw null pointer exception.

From-SVN: r26856

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0386adc803371eda8f0811554d4fff262eebcc35..b7d54b391bfa5b40a4a0b55a04a8d5ee0560b722 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 1999-05-10  Tom Tromey  <tromey@cygnus.com>
 
+       * java/util/ResourceBundle.java (partialGetBundle): Explicitly use
+       locale.toString().
+       (getBundle): Don't explicitly throw null pointer exception.
+
        * gnu/gcj/RawData.java: Added copyright header.
 
        * include/jni.h (_Jv_va_list): Always define as va_list.

diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 05503c619e9fed5bd719b183a2176ff6f62d4909..2a11083b010f87342a35606ac6643d97345e98d1 100644 (file)
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -129,7 +129,9 @@ public abstract class ResourceBundle
     {
       ResourceBundle rb;
 
-      String bundleName = baseName + "_" + locale;
+      // Explicitly invoke locale.toString() to force a
+      // NullPointerException when required.
+      String bundleName = baseName + "_" + locale.toString();
 
       // Check the cache.
       Object obj = resource_cache.get(bundleName);
@@ -154,11 +156,6 @@ public abstract class ResourceBundle
       ResourceBundle rb;
       Class rbc;
 
-      // FIXME: We can't currently rely on NullPointerException being
-      // thrown when we invoke a method on a null object.
-      if (locale == null)
-       throw new NullPointerException ();
-
       rb = partialGetBundle(baseName, locale, false);
       if (rb != null)
        return rb;