Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-09-05 02:47:00 +0000
committerJan Bartel2013-09-05 02:47:39 +0000
commite764a0f2e7e7d320a7b3dbd76e750a9353d2416a (patch)
tree956df6f5c11bdf3c1b52e3db509419544dba0551 /jetty-webapp
parent3d6711b4ab6a43ba76a0c92da3a7a25a05094ef9 (diff)
downloadorg.eclipse.jetty.project-e764a0f2e7e7d320a7b3dbd76e750a9353d2416a.tar.gz
org.eclipse.jetty.project-e764a0f2e7e7d320a7b3dbd76e750a9353d2416a.tar.xz
org.eclipse.jetty.project-e764a0f2e7e7d320a7b3dbd76e750a9353d2416a.zip
416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars
Diffstat (limited to 'jetty-webapp')
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
index f2bd380349..1361348479 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -87,7 +87,10 @@ public class WebInfConfiguration extends AbstractConfiguration
context.getMetaData().addContainerJar(Resource.newResource(uri));
}
};
- ClassLoader loader = context.getClassLoader();
+ ClassLoader loader = null;
+ if (context.getClassLoader() != null)
+ loader = context.getClassLoader().getParent();
+
while (loader != null && (loader instanceof URLClassLoader))
{
URL[] urls = ((URLClassLoader)loader).getURLs();

Back to the top