diff options
| -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 b38b3e3..8b72a7b 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 b5edfbf..639872b 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; |