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

Make rSocketServerBootstrap @ConditionalOnMissingBean 

7857dd2d72 broke gateway's ability to override the `SocketAcceptor`.
This commit is contained in:
Spencer Gibb 2019-06-24 16:13:36 -04:00 committed by GitHub
parent 7405efa326
commit 2cb6af959b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,7 @@ public class RSocketServerAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean
public RSocketServerBootstrap rSocketServerBootstrap(RSocketServerFactory rSocketServerFactory,
RSocketMessageHandler rSocketMessageHandler) {
return new RSocketServerBootstrap(rSocketServerFactory, rSocketMessageHandler.serverAcceptor());