Author: markt
Date: Tue May 11 09:46:42 2010
New Revision: 943065
URL: http://svn.apache.org/viewvc?rev=943065&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
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=943065&r1=943064&r2=943065&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 11
09:46:42 2010
@@ -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 :
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
