From 16df2919957cd0bb2f71f0aaf3c2b2827da5210c Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Oct 2010 16:05:55 +0000
Subject: [PATCH] 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
---
 java/org/apache/catalina/startup/ContextConfig.java | 4 ++++
 webapps/docs/changelog.xml                          | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index a04b97a16..d08ee4252 100644
--- 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 5f90634d1..25f4d53a8 100644
--- 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">
-- 
2.11.0