From 2cb6af959b91da31ffc3060295b0f6ec262d0a30 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 24 Jun 2019 16:13:36 -0400 Subject: [PATCH] Make rSocketServerBootstrap @ConditionalOnMissingBean 7857dd2d7230ab48c53e8648c23647e3b793b895 broke gateway's ability to override the `SocketAcceptor`. --- .../autoconfigure/rsocket/RSocketServerAutoConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java index b02aae7f49c..c908cf35854 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java @@ -98,6 +98,7 @@ public class RSocketServerAutoConfiguration { } @Bean + @ConditionalOnMissingBean public RSocketServerBootstrap rSocketServerBootstrap(RSocketServerFactory rSocketServerFactory, RSocketMessageHandler rSocketMessageHandler) { return new RSocketServerBootstrap(rSocketServerFactory, rSocketMessageHandler.serverAcceptor());