Mark Wielaard wrote:
> Does the dacapo xalan work for you with the following patch?
>
> diff -u -r1.36 ResourceBundle.java
> --- java/util/ResourceBundle.java 23 Oct 2005 17:04:46
> -0000 1.36
> +++ java/util/ResourceBundle.java 1 Mar 2006 10:59:59 -0000
> @@ -476,9 +476,7 @@
> if (ResourceBundle.class.isAssignableFrom(rbClass))
> bundle = (ResourceBundle) rbClass.newInstance();
> }
> - catch (IllegalAccessException ex) {}
> - catch (InstantiationException ex) {}
> - catch (ClassNotFoundException ex) {}
> + catch (Throwable t) { /* Class initialization failed, no
> valid bundle. */ }
> if (bundle == null)
> {
Catching Throwable is not required (and not what Sun does). I've tested
Dacapo with the attached patch and now it works, so I'm going to check
it in.
Regards,
Jeroen
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.36
diff -u -r1.36 ResourceBundle.java
--- java/util/ResourceBundle.java 23 Oct 2005 17:04:46 -0000 1.36
+++ java/util/ResourceBundle.java 1 Mar 2006 11:25:01 -0000
@@ -1,5 +1,5 @@
/* ResourceBundle -- aids in loading resource bundles
- Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005
+ Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -476,9 +476,7 @@
if (ResourceBundle.class.isAssignableFrom(rbClass))
bundle = (ResourceBundle) rbClass.newInstance();
}
- catch (IllegalAccessException ex) {}
- catch (InstantiationException ex) {}
- catch (ClassNotFoundException ex) {}
+ catch (Exception ex) {}
if (bundle == null)
{
