Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-09-05 02:55:19 +0000
committerJan Bartel2013-09-05 02:55:19 +0000
commit2ab4757450d15011e1c1e19d0eef784cf6c8746d (patch)
treeef785183c10fd3ae3eec6585c3c3e5aa645244e1 /jetty-webapp
parent2a178a29fd335b600d0236cbd2eeb37b53b25d53 (diff)
parente764a0f2e7e7d320a7b3dbd76e750a9353d2416a (diff)
downloadorg.eclipse.jetty.project-2ab4757450d15011e1c1e19d0eef784cf6c8746d.tar.gz
org.eclipse.jetty.project-2ab4757450d15011e1c1e19d0eef784cf6c8746d.tar.xz
org.eclipse.jetty.project-2ab4757450d15011e1c1e19d0eef784cf6c8746d.zip
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
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