diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java index eea92e9f19d..0e8b7c42d27 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java @@ -405,8 +405,7 @@ public class JarFileResource extends JarResource return url.sameFile(resource.getURI().toURL()); } - @Override - public File getFile() + public File getJarFile() { if (_file != null) return _file; 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 08fcccbe4dc..0d3205f5fed 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 @@ -42,6 +42,7 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; +import org.eclipse.jetty.util.resource.JarFileResource; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; @@ -814,6 +815,11 @@ public class WebInfConfiguration extends AbstractConfiguration try { File resourceFile = resource.getFile(); + if ((resourceFile != null) && (resource instanceof JarFileResource)) + { + resourceFile = ((JarFileResource)resource).getJarFile(); + } + if (resourceFile != null) { return resourceFile.getName();