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

Merge branch '2.3.x' into 2.4.x

Browse Source
pull/25709/head
Andy Wilkinson 4 years ago
parent ba5c57c1b2 b76a9951e9
commit dace7bb742
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
Unescape Escape View File

@ -65,7 +65,7 @@ public class RSocketServerAutoConfiguration {
@Conditional(OnRSocketWebServerCondition.class) @Conditional(OnRSocketWebServerCondition.class)
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class WebFluxServerAutoConfiguration { static class WebFluxServerConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ -80,7 +80,7 @@ public class RSocketServerAutoConfiguration {
@ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port") @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port")
@ConditionalOnClass(ReactorResourceFactory.class) @ConditionalOnClass(ReactorResourceFactory.class)
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class EmbeddedServerAutoConfiguration { static class EmbeddedServerConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean

Write Preview
Loading…
Cancel
Save