Skip to content

S
spring-boot
Commit a8ca01cf authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge pull request #2245 from cemo/fix-jetty9-jar-url 

* fix-jetty9-jar-url:
  Fix potential Jetty MalformedURLException
parents 4ad5c52d 1fc9d383
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @ a8ca01cf
...@@ -40,6 +40,7 @@ import org.eclipse.jetty.server.handler.ErrorHandler; ...@@ -40,6 +40,7 @@ import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.ServletMapping; import org.eclipse.jetty.servlet.ServletMapping;
import org.eclipse.jetty.util.resource.JarResource;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.AbstractConfiguration;
...@@ -259,7 +260,8 @@ public class JettyEmbeddedServletContainerFactory extends ...@@ -259,7 +260,8 @@ public class JettyEmbeddedServletContainerFactory extends
if (root != null) { if (root != null) {
try { try {
if (!root.isDirectory()) { if (!root.isDirectory()) {
Resource resource = Resource.newResource("jar:" + root.toURI() + "!"); Resource resource = JarResource.newJarResource(Resource
.newResource(root));
handler.setBaseResource(resource); handler.setBaseResource(resource);
} }
else { else {
......
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