diff options
| author | Jan Bartel | 2013-09-05 03:20:39 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-09-05 03:20:39 +0000 |
| commit | 6fb95b8ad7564af60fc945d69b5ec5667cdbdb6a (patch) | |
| tree | d3c7d7f281d733ac737806ed393ccea7044d6621 | |
| parent | a3f66333858269daf03679e6251c6f89c811f523 (diff) | |
| parent | edaa23b21e31e0c469c5f4c8b7e2d0e23a92719b (diff) | |
| download | org.eclipse.jetty.project-6fb95b8ad7564af60fc945d69b5ec5667cdbdb6a.tar.gz org.eclipse.jetty.project-6fb95b8ad7564af60fc945d69b5ec5667cdbdb6a.tar.xz org.eclipse.jetty.project-6fb95b8ad7564af60fc945d69b5ec5667cdbdb6a.zip | |
Merge remote-tracking branch 'origin/master' into jetty-9.1
| -rw-r--r-- | jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java | 5 |
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(); |