[jbossweb-commits] JBossWeb SVN: r1471 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2010-05-11 04:49:03 -0400 (Tue, 11 May 2010)
New Revision: 1471
Modified:
trunk/java/org/apache/catalina/core/LocalStrings.properties
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/webapps/docs/changelog.xml
Log:
- Improve createWrapper error reporting, as reported by Carlo.
Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/core/LocalStrings.properties 2010-05-07 22:48:28 UTC
(rev 1470)
+++ trunk/java/org/apache/catalina/core/LocalStrings.properties 2010-05-11 08:49:03 UTC
(rev 1471)
@@ -82,6 +82,7 @@
standardContext.applicationListener=Error configuring application listener of class {0}
standardContext.applicationSkipped=Skipped installing application listeners due to
previous error(s)
standardContext.badRequest=Invalid request path ({0}).
+standardContext.createWrapper.failed=Create wrapper failed.
standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can
never be matched.
standardContext.duplicateListener=The listener "{0}" is already configured for
this context. The duplicate definition has been ignored.
standardContext.errorPage.error=Error page location {0} must start with a
''/''
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2010-05-07 22:48:28 UTC (rev
1470)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-05-11 08:49:03 UTC (rev
1471)
@@ -2313,8 +2313,7 @@
try {
wrapper = (Wrapper) wrapperClass.newInstance();
} catch (Throwable t) {
- log.error("createWrapper", t);
- return (null);
+ throw new
IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t);
}
} else {
wrapper = new StandardWrapper();
@@ -2327,8 +2326,7 @@
(InstanceListener) clazz.newInstance();
wrapper.addInstanceListener(listener);
} catch (Throwable t) {
- log.error("createWrapper", t);
- return (null);
+ throw new
IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t);
}
}
@@ -2340,8 +2338,7 @@
if (wrapper instanceof Lifecycle)
((Lifecycle) wrapper).addLifecycleListener(listener);
} catch (Throwable t) {
- log.error("createWrapper", t);
- return (null);
+ throw new
IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t);
}
}
@@ -2352,8 +2349,7 @@
(ContainerListener) clazz.newInstance();
wrapper.addContainerListener(listener);
} catch (Throwable t) {
- log.error("createWrapper", t);
- return (null);
+ throw new
IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t);
}
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-05-07 22:48:28 UTC (rev 1470)
+++ trunk/webapps/docs/changelog.xml 2010-05-11 08:49:03 UTC (rev 1471)
@@ -38,6 +38,9 @@
<add>
Add csrf filter for compatibility with Tomcat. (markt)
</add>
+ <fix>
+ Improve StandardWrapper.createWrapper error reporting. (remm)
+ </fix>
</changelog>
</subsection>
</section>