diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/ResourceBundle.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2bad1d4..65ae5a1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-10-21 Tom Tromey <tromey@redhat.com> + + * java/util/ResourceBundle.java (tryBundle): Also ignore + ClassCastException. + 2004-10-21 Kaz Kojima <kkojima@gcc.gnu.org> * configure.ac (SIGNAL_HANDLER): Set to include/sh-signal.h diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index fdeaeed..3299c6f 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -1,5 +1,5 @@ /* ResourceBundle -- aids in loading resource bundles - Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -478,6 +478,7 @@ public abstract class ResourceBundle catch (IllegalAccessException ex) {} catch (InstantiationException ex) {} catch (ClassNotFoundException ex) {} + catch (ClassCastException ex) {} if (bundle == null) { |