root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.x' 

Closes gh-17122
This commit is contained in:
Andy Wilkinson 2019-06-12 12:53:49 +01:00
parent 5375681fa5 4222c5b8ce
commit 5e3c86ab8d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/JarResourceManager.java
View File

@ -26,6 +26,8 @@ import io.undertow.server.handlers.resource.ResourceChangeListener;
import io.undertow.server.handlers.resource.ResourceManager; import io.undertow.server.handlers.resource.ResourceManager;
import io.undertow.server.handlers.resource.URLResource; import io.undertow.server.handlers.resource.URLResource;
import org.springframework.util.StringUtils;
/** /**
* {@link ResourceManager} for JAR resources. * {@link ResourceManager} for JAR resources.
* *
@ -48,7 +50,7 @@ class JarResourceManager implements ResourceManager {
public Resource getResource(String path) throws IOException { public Resource getResource(String path) throws IOException {
URL url = new URL("jar:file:" + this.jarPath + "!" + (path.startsWith("/") ? path : "/" + path)); URL url = new URL("jar:file:" + this.jarPath + "!" + (path.startsWith("/") ? path : "/" + path));
URLResource resource = new URLResource(url, path); URLResource resource = new URLResource(url, path);
if (resource.getContentLength() < 0) { if (StringUtils.hasText(path) && !"/".equals(path) && resource.getContentLength() < 0) {
return null; return null;
} }
return resource; return resource;