diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-21 21:25:55 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-21 21:25:55 +0000 |
| commit | a5def6cf7f4cfae9795ae7f765f0fd1e0a5b1f82 (patch) | |
| tree | 40e946f54b5caadf64b291e13669732a0ddcdb50 /libjava | |
| parent | 6bc21dca1e7ae2207a04646ca5df98e1356cf066 (diff) | |
| download | ppe42-gcc-a5def6cf7f4cfae9795ae7f765f0fd1e0a5b1f82.tar.gz ppe42-gcc-a5def6cf7f4cfae9795ae7f765f0fd1e0a5b1f82.zip | |
* java/util/ResourceBundle.java (trySomeGetBundle): Removed
debugging prints.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35859 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/ResourceBundle.java | 28 |
2 files changed, 17 insertions, 16 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b38b3e394de..8b72a7b9b8b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-08-21 Tom Tromey <tromey@cygnus.com> + + * java/util/ResourceBundle.java (trySomeGetBundle): Removed + debugging prints. + Sun Aug 20 21:02:48 2000 Anthony Green <green@redhat.com> * java/lang/natSystem.cc (init_properties): Change sourceware diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index b5edfbf20f9..639872bb838 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -115,26 +115,22 @@ public abstract class ResourceBundle } // Look for a properties file. - { - String prop_name = (bundleName.replace('.', '/') + ".properties"); - System.out.println ("trying '" + prop_name + "' for '" + bundleName); - InputStream i = ClassLoader.getSystemResourceAsStream (prop_name); - /* - InputStream i = - ClassLoader.getSystemResourceAsStream (bundleName.replace ('.', '/') - + ".properties"); - */ - if (i != null) - { - try { + InputStream i = + ClassLoader.getSystemResourceAsStream (bundleName.replace ('.', '/') + + ".properties"); + if (i != null) + { + try + { return new PropertyResourceBundle (i); - } catch (java.io.IOException e) { + } + catch (java.io.IOException e) + { // The docs don't appear to define what happens in // this case, but it seems like continuing the // search is a reasonable thing to do. } - } - } + } if (bundleName.equals(stopHere)) return result; |

