Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-09-05 02:47:00 +0000
committerJan Bartel2013-09-05 03:03:45 +0000
commitedaa23b21e31e0c469c5f4c8b7e2d0e23a92719b (patch)
treedf3f8c37f5d5a49f395cdfcba5304aeaa4893315
parentce098c67deb25b2bf19a81413405f22ed12722d6 (diff)
downloadorg.eclipse.jetty.project-edaa23b21e31e0c469c5f4c8b7e2d0e23a92719b.tar.gz
org.eclipse.jetty.project-edaa23b21e31e0c469c5f4c8b7e2d0e23a92719b.tar.xz
org.eclipse.jetty.project-edaa23b21e31e0c469c5f4c8b7e2d0e23a92719b.zip
416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars
-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 96f1c5fc7a..e360faf76e 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
@@ -88,7 +88,10 @@ public class WebInfConfiguration extends AbstractConfiguration
context.getMetaData().addContainerResource(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