Skip to content

S
spring-boot
Commit 5e3c86ab authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.1.x' 

Closes gh-17122
parents 5375681f 4222c5b8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/JarResourceManager.java
View file @ 5e3c86ab
...@@ -26,6 +26,8 @@ import io.undertow.server.handlers.resource.ResourceChangeListener; ...@@ -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 { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment