Skip to content

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

Disable Undertow auto-config if required XNIO classes are unavailable 

Fixes gh-1986
parent dea1ca98
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
View file @ d5ad502d
...@@ -48,6 +48,7 @@ import org.springframework.core.Ordered; ...@@ -48,6 +48,7 @@ import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.AnnotationMetadata;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.xnio.SslClientAuthMode;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers. * {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers.
...@@ -96,7 +97,7 @@ public class EmbeddedServletContainerAutoConfiguration { ...@@ -96,7 +97,7 @@ public class EmbeddedServletContainerAutoConfiguration {
* Nested configuration if Undertow is being used. * Nested configuration if Undertow is being used.
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Servlet.class, Undertow.class }) @ConditionalOnClass({ Servlet.class, Undertow.class, SslClientAuthMode.class })
@ConditionalOnMissingBean(value = EmbeddedServletContainerFactory.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = EmbeddedServletContainerFactory.class, search = SearchStrategy.CURRENT)
public static class EmbeddedUndertow { public static class EmbeddedUndertow {
......
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