Author: markt
Date: Thu Oct 14 16:05:55 2010
New Revision: 1022593
URL: http://svn.apache.org/viewvc?rev=1022593&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50087
Catch ClassFormatErrors when scanning for annotations.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
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=1022593&r1=1022592&r2=1022593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Oct 14
16:05:55 2010
@@ -1958,6 +1958,10 @@ public class ContextConfig
log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
className), e);
return;
+ } catch (ClassFormatError e) {
+ log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
+ className), e);
+ return;
}
if (clazz.isAnnotation()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022593&r1=1022592&r2=1022593&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 14 16:05:55 2010
@@ -121,6 +121,10 @@
causes applications marked as meta-data complete to return 404s for all
requests. Patch provided by heyoulin. (markt)
</fix>
+ <fix>
+ <bug>50087</bug>: Catch ClassFormatErrors when scanning for
annotations.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
