Author: markt
Date: Thu Feb 28 00:36:50 2013
New Revision: 1451061
URL: http://svn.apache.org/r1451061
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54585
Take account of setting of delegate when building the class path that is passed
to Jasper
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1451061&r1=1451060&r2=1451061&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu Feb 28
00:36:50 2013
@@ -811,6 +811,12 @@ public class WebappLoader extends Lifecy
// Assemble the class path information from our class loader chain
ClassLoader loader = getClassLoader();
+
+ if (delegate && loader != null) {
+ // Skip the webapp loader for now as delegation is enabled
+ loader = loader.getParent();
+ }
+
while (loader != null) {
if (!buildClassPath(servletContext, classpath, loader)) {
break;
@@ -818,6 +824,14 @@ public class WebappLoader extends Lifecy
loader = loader.getParent();
}
+ if (delegate) {
+ // Delegation was enabled, go back and add the webapp paths
+ loader = getClassLoader();
+ if (loader != null) {
+ buildClassPath(servletContext, classpath, loader);
+ }
+ }
+
this.classpath=classpath.toString();
// Store the assembled class path as a servlet context attribute
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
