ResourceBundle.java (getBundle): Throw NullPointerException if baseName is null.

	* java/util/ResourceBundle.java (getBundle): Throw
	NullPointerException if baseName is null.

From-SVN: r27126

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 791fa6f15348cece31f62cf4924a0e53e67b7b90..576f7d3ee30a418d01d348819b2357a45fcd1a44 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-24  Tom Tromey  <tromey@cygnus.com>
+
+       * java/util/ResourceBundle.java (getBundle): Throw
+       NullPointerException if baseName is null.
+
 1999-05-22  Tom Tromey  <tromey@cygnus.com>
 
        * java/util/zip/ZipInputStream.java (fill): New method.

diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 2a11083b010f87342a35606ac6643d97345e98d1..5a2002aabb6cce9e9f92dc6f805c8f1c678e2d2b 100644 (file)
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -156,6 +156,9 @@ public abstract class ResourceBundle
       ResourceBundle rb;
       Class rbc;
 
+      if (baseName == null)
+       throw new NullPointerException ();
+
       rb = partialGetBundle(baseName, locale, false);
       if (rb != null)
        return rb;
@@ -167,7 +170,7 @@ public abstract class ResourceBundle
          if (rb != null)
            return rb;
        }
-                          
+
       throw new MissingResourceException("can't load bundle", 
                                         baseName,
                                         "bundle");