Browse Source

Make Tomcat auto-config back off when UpgradeProtocol is absent

Closes gh-10960
pull/10972/head
Andy Wilkinson 8 years ago
parent
commit
f4570710c1
  1. 3
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java

@ -21,6 +21,7 @@ import javax.servlet.ServletRequest;
import io.undertow.Undertow; import io.undertow.Undertow;
import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat;
import org.apache.coyote.UpgradeProtocol;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
@ -84,7 +85,7 @@ public class ServletWebServerFactoryAutoConfiguration {
* Nested configuration if Tomcat is being used. * Nested configuration if Tomcat is being used.
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Servlet.class, Tomcat.class }) @ConditionalOnClass({ Servlet.class, Tomcat.class, UpgradeProtocol.class })
@ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
public static class EmbeddedTomcat { public static class EmbeddedTomcat {

Loading…
Cancel
Save