Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #4173 - use JarFileResource's Jar java.io.File object if present 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-11-07 05:11:48 -06:00
parent 13a574557b
commit 64a916e6ec
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
View File

@ -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;

6
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -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();