From a81eb0107790afbf403b3b2721be21864f11c65e Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@cygnus.com>
Date: Mon, 24 May 1999 15:00:02 +0000
Subject: [PATCH] ResourceBundle.java (getBundle): Throw NullPointerException
if baseName is null.
* java/util/ResourceBundle.java (getBundle): Throw
NullPointerException if baseName is null.
From-SVN: r27126
---
libjava/ChangeLog | 5 +++++
libjava/java/util/ResourceBundle.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 791fa6f15348..576f7d3ee30a 100644
--- 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 2a11083b010f..5a2002aabb6c 100644
--- 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");
--
GitLab