ResourceBundle.java (tryBundle): Also ignore ClassCastException.

	* java/util/ResourceBundle.java (tryBundle): Also ignore
	ClassCastException.

From-SVN: r89379

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2bad1d497502aff0293662a3f28b141b9ae251aa..65ae5a1a5f0c6a1aa2534681bdbc6b42fafdff8d 100644 (file)
--- 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 fdeaeedff9e2624165132d6ebac008d192e87132..3299c6ff82507bf0d2a33080ba04b6120cb93c6d 100644 (file)
--- 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)
       {