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

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

* fix-jetty9-jar-url:
  Fix potential Jetty MalformedURLException
This commit is contained in:
Phillip Webb 2015-01-06 22:44:02 -08:00
parent 4ad5c52dd7 1fc9d38396
commit a8ca01cf51
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/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@ -40,6 +40,7 @@ import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.servlet.ServletHolder;
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.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.AbstractConfiguration;
@ -259,7 +260,8 @@ public class JettyEmbeddedServletContainerFactory extends
if (root != null) {
try {
if (!root.isDirectory()) {
Resource resource = Resource.newResource("jar:" + root.toURI() + "!");
Resource resource = JarResource.newJarResource(Resource
.newResource(root));
handler.setBaseResource(resource);
}
else {