From e62c8a680f21290ee065a70d137f5f349cb1bbbb Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 31 Jul 2011 17:08:43 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51586
 Expand error handling to cover anything that is recoverable (or might be
 recoverable) when loading classes during HandlesTypes processing.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152595 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/ContextConfig.java | 5 +++++
 webapps/docs/changelog.xml                          | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index d95995202..334f3cb71 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2016,6 +2016,11 @@ public class ContextConfig
             log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
                     className), e);
             return;
+        } catch (Throwable t) {
+            ExceptionUtils.handleThrowable(t);
+            log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
+                    className), t);
+            return;
         }
 
         if (clazz.isAnnotation()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 87b800d85..72c22225e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,11 @@
         to/from URLs when working with resources from a Context so special
         characters don't cause issues. (markt)
       </fix>
+      <fix>
+        <bug>51586</bug>: Expand error handling to cover anything that is
+        recoverable (or might be recoverable) when loading classes during
+        HandlesTypes processing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0