Author: markt
Date: Mon Dec 3 13:18:34 2012
New Revision: 1416501
URL: http://svn.apache.org/viewvc?rev=1416501&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53871
Improve error message for StackOverflowError
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1416501&r1=1416500&r2=1416501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Dec 3
13:18:34 2012
@@ -1957,8 +1957,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/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1416501&r1=1416500&r2=1416501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon
Dec 3 13:18:34 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}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
