root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

This commit is contained in:
Andy Wilkinson 2021-03-09 09:25:55 +00:00
parent 565dc0cc0f dace7bb742
commit 06b751a0dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
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