Author: jfrederic.clere(a)jboss.com Date: 2009-01-09 06:58:24 -0500 (Fri, 09 Jan 2009) New Revision: 897 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java Log: Hack for JBPAPP-869. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2009-01-07 15:37:49 UTC (rev 896) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2009-01-09 11:58:24 UTC (rev 897) @@ -111,6 +111,10 @@ public static final boolean ENABLE_CLEAR_REFERENCES = Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES", "true")).booleanValue(); + + public static final boolean SYSTEM_CL_DELEGATION = + Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.SYSTEM_CL_DELEGATION", "true")).booleanValue(); + protected class PrivilegedFindResource implements PrivilegedAction { @@ -1269,15 +1273,17 @@ // (0.2) Try loading the class with the system class loader, to prevent // the webapp from overriding J2SE classes - try { - clazz = system.loadClass(name); - if (clazz != null) { - if (resolve) - resolveClass(clazz); - return (clazz); + if (SYSTEM_CL_DELEGATION) { + try { + clazz = system.loadClass(name); + if (clazz != null) { + if (resolve) + resolveClass(clazz); + return (clazz); + } + } catch (ClassNotFoundException e) { + // Ignore } - } catch (ClassNotFoundException e) { - // Ignore } // (0.5) Permission to access this class when using a SecurityManager