root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source 
Closes gh-22283
pull/22294/head
Andy Wilkinson 4 years ago
parent 6dee7e6cf8 c765df6e5d
commit 553d58a234
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java
Unescape Escape View File

@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.web.reactive;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import io.undertow.Undertow; import io.undertow.Undertow;
import org.eclipse.jetty.servlet.ServletHolder;
import reactor.netty.http.server.HttpServer; import reactor.netty.http.server.HttpServer;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
@ -100,7 +101,7 @@ abstract class ReactiveWebServerFactoryConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(ReactiveWebServerFactory.class) @ConditionalOnMissingBean(ReactiveWebServerFactory.class)
@ConditionalOnClass({ org.eclipse.jetty.server.Server.class }) @ConditionalOnClass({ org.eclipse.jetty.server.Server.class, ServletHolder.class })
static class EmbeddedJetty { static class EmbeddedJetty {
@Bean @Bean

Write Preview
Loading…
Cancel
Save