diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-10 08:58:54 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-10 08:58:54 +0000 |
| commit | 3566fcc9cae900b9934dfaddf6474371dcaf2f20 (patch) | |
| tree | 642bcda3de5f4ebd946cefa9fd7eacd6f8e0c621 /libjava | |
| parent | 74a34205af1058c119b08a0367b1cd2838b2a995 (diff) | |
| download | ppe42-gcc-3566fcc9cae900b9934dfaddf6474371dcaf2f20.tar.gz ppe42-gcc-3566fcc9cae900b9934dfaddf6474371dcaf2f20.zip | |
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/util/ResourceBundle.java | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0386adc8033..b7d54b391bf 100644 --- 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 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; |
