From 2b607265f5dd1128c9892e351e9b56b0368e3e9b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 10 May 1999 08:58:54 +0000 Subject: 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 --- libjava/java/util/ResourceBundle.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libjava/java/util/ResourceBundle.java') 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; -- cgit v1.2.3