yoavs 2004/09/03 11:06:23
Modified: catalina/src/share/org/apache/naming/factory Tag: TOMCAT_5_0
BeanFactory.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 31052
Revision Changes Path
No revision
No revision
1.2.2.2 +12 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java
Index: BeanFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- BeanFactory.java 21 Aug 2004 15:50:00 -0000 1.2.2.1
+++ BeanFactory.java 3 Sep 2004 18:06:23 -0000 1.2.2.2
@@ -220,13 +220,21 @@
return bean;
} catch (java.beans.IntrospectionException ie) {
- throw new NamingException(ie.getMessage());
+ NamingException ne = new NamingException(ie.getMessage());
+ ne.setRootCause(ie);
+ throw ne;
} catch (java.lang.IllegalAccessException iae) {
- throw new NamingException(iae.getMessage());
+ NamingException ne = new NamingException(iae.getMessage());
+ ne.setRootause(iae);
+ throw ne;
} catch (java.lang.InstantiationException ie2) {
- throw new NamingException(ie2.getMessage());
+ NamingException ne = new NamingException(ie2.getMessage());
+ ne.setRootCause(ie2);
+ throw ne;
} catch (java.lang.reflect.InvocationTargetException ite) {
- throw new NamingException(ite.getMessage());
+ NamingException ne = new NamingException(ite.getMessage());
+ ne.setRootCause(ite);
+ throw ne;
}
} else {
No revision
No revision
1.70.2.30 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.29
retrieving revision 1.70.2.30
diff -u -r1.70.2.29 -r1.70.2.30
--- changelog.xml 2 Sep 2004 19:18:07 -0000 1.70.2.29
+++ changelog.xml 3 Sep 2004 18:06:23 -0000 1.70.2.30
@@ -60,6 +60,9 @@
<fix>
<bug>30415</bug>: Directories ending in .war not handled well. (yoavs)
</fix>
+ <fix>
+ <bug>31052</bug>: BeanFactory swallows root cause of exception. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
