* java/util/ResourceBundle.java (partialGetBundle): Explicitly use

	locale.toString().
	(getBundle): Don't explicitly throw null pointer exception.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26856 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 6 deletions

diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 05503c619e9..2a11083b010 100644
--- 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;