Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid a clash with TomcatURLStreamHandlerFactory

Browse Source 
In the unlikely (outside the tests of a number of Spring Boot's
modules) event that both Tomcat and Jetty are on the classpath,
there's a risk that Tomcat will try to register its
URLStreamHandlerFactory after JasperInitializer has registered its
WarUrlStreamHandlerFactory. Should this happen, Tomcat will fail to
start.

TomcatURLStreamHandlerFactory registers a handler for the war: URLs
produced by org.apache.tomcat.util.scan.JarFactory that's used by
both Tomcat and Jetty's Jasper integration. This makes it a suitable
replacement for WarUrlStreamHandlerFactory so this commit updates
JasperIntializer to register TomcatURLStreamHandlerFactory when it's
available, falling back to WarUrlStreamHandlerFactory when it's not.

Closes gh-8622
This commit is contained in:
Andy Wilkinson
2017-05-11 21:03:42 +01:00
parent 71b53e816d
commit ef12eecb7e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JasperInitializer.java
View File

@@ -25,6 +25,7 @@ import java.net.URLStreamHandlerFactory;
import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContainerInitializer;
import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
@@ -69,11 +70,18 @@ class JasperInitializer extends AbstractLifeCycle {
if (this.initializer == null) { if (this.initializer == null) {
return; return;
} }
try { if (ClassUtils.isPresent(
URL.setURLStreamHandlerFactory(new WarUrlStreamHandlerFactory()); "org.apache.catalina.webresources.TomcatURLStreamHandlerFactory",
getClass().getClassLoader())) {
TomcatURLStreamHandlerFactory.register();
} }
catch (Error ex) { else {
// Ignore try {
URL.setURLStreamHandlerFactory(new WarUrlStreamHandlerFactory());
}
catch (Error ex) {
// Ignore
}
} }
ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try { try {