From eaac4771f91abec0d0044eb3abe1a330bb989f37 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 May 2010 09:46:42 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49240
 If a class can't be loaded, don't scan HandlesTypes for it Also handle
 NoClassDefFoundError Patch provided by pid

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@943065 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/ContextConfig.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index af9ecf1bd..912825c17 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1871,11 +1871,15 @@ public class ContextConfig
         
         Class<?> clazz = null;
         try {
-            clazz = Class.forName(className, true,
-                    context.getLoader().getClassLoader());
+            clazz = context.getLoader().getClassLoader().loadClass(className);
+        } catch (NoClassDefFoundError e) {
+            log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
+                    className), e);
+            return;
         } catch (ClassNotFoundException e) {
             log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
                     className), e);
+            return;
         }
 
         for (Map.Entry<Class<?>, Set<ServletContainerInitializer>> entry :
-- 
2.11.0