Author: markt
Date: Mon Dec 3 13:21:57 2012
New Revision: 1416502
URL: http://svn.apache.org/viewvc?rev=1416502&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53871
Improve error message for StackOverflowError
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1416501
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1416502&r1=1416501&r2=1416502&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Dec 3 13:21:57 2012
@@ -2102,8 +2102,13 @@ public class ContextConfig implements Li
ClassParser parser = new ClassParser(is, null);
JavaClass clazz = parser.parse();
-
- checkHandlesTypes(clazz);
+ try {
+ checkHandlesTypes(clazz);
+ } catch (StackOverflowError soe) {
+ throw new IllegalStateException(sm.getString(
+ "contextConfig.annotationsStackOverflow",
+ context.getName()), soe);
+ }
if (handlesTypesOnly) {
return;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1416502&r1=1416501&r2=1416502&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Dec 3 13:21:57 2012
@@ -18,6 +18,7 @@ catalina.noCluster=Cluster RuleSet not f
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
+contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}]. Possible root causes include a too low
setting for -Xss and illegal cyclic inheritance dependencies
contextConfig.applicationUrl=Unable to determine URL for application web.xml
contextConfig.applicationMissing=Missing application web.xml, using defaults
only
contextConfig.applicationParse=Parse error in application web.xml file at {0}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1416502&r1=1416501&r2=1416502&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Dec 3 13:21:57 2012
@@ -57,6 +57,11 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>53871</bug>: Improve error message if annotation scanning fails
+ during web application start due to poor configuration or illegal
+ cyclic inheritance with the application's classes. (markt)
+ </fix>
+ <fix>
Fix unit test for AccessLogValve when using non-GMT time zone. (rjung)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
