Author: remy.maucherat(a)jboss.com Date: 2008-01-18 11:19:56 -0500 (Fri, 18 Jan 2008) New Revision: 402 Modified: trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java trunk/webapps/docs/changelog.xml Log: - Finish removing of URL CL hardcoding. Modified: trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-01-18 07:56:24 UTC (rev 401) +++ trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-01-18 16:19:56 UTC (rev 402) @@ -154,7 +154,7 @@ */ private ServletContext context; private Options options; - private URLClassLoader parentClassLoader; + private ClassLoader parentClassLoader; private PermissionCollection permissionCollection; private CodeSource codeSource; private String classpath; @@ -222,7 +222,7 @@ * * @return URLClassLoader parent */ - public URLClassLoader getParentClassLoader() { + public ClassLoader getParentClassLoader() { return parentClassLoader; } @@ -325,7 +325,11 @@ */ private void initClassPath() { - URL [] urls = parentClassLoader.getURLs(); + if (!(parentClassLoader instanceof URLClassLoader)) { + return; + } + + URL [] urls = ((URLClassLoader) parentClassLoader).getURLs(); StringBuffer cpath = new StringBuffer(); String sep = System.getProperty("path.separator"); @@ -409,7 +413,7 @@ "accessClassInPackage.org.apache.jasper.runtime") ); if (parentClassLoader instanceof URLClassLoader) { - URL [] urls = parentClassLoader.getURLs(); + URL [] urls = ((URLClassLoader) parentClassLoader).getURLs(); String jarUrl = null; String jndiUrl = null; for (int i=0; i<urls.length; i++) { Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-18 07:56:24 UTC (rev 401) +++ trunk/webapps/docs/changelog.xml 2008-01-18 16:19:56 UTC (rev 402) @@ -195,6 +195,10 @@ <fix> <bug>43743</bug>: Correctly handle nest tag files packaged in a jar. (markt) </fix> + <fix> + Finish removing of some URL CL hardcoding. If parent CL is not a URL CL, the Ant classpath cannot + be generated, and security setup might be incomplete. (remm) + </fix> </changelog> </subsection> <subsection name="Webapps">