Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50087

Catch ClassFormatErrors when scanning for annotations.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1022593 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index a04b97a..d08ee42 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -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()) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f90634..25f4d53 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">