Skip to content

Clash of websocketContainerCustomizer beans if Tomcat and Jetty both present #14582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Clash of websocketContainerCustomizer beans if Tomcat and Jetty both present #14582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ngframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
* installs the Tomcat WebSocket initializer.
*
* @author Brian Clozel
* @author Artsiom Yudovin
* @since 2.0.0
*/
@Configuration
Expand All @@ -52,7 +53,7 @@ static class TomcatWebSocketConfiguration {

@Bean
@ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer")
public TomcatWebSocketReactiveWebServerCustomizer websocketContainerCustomizer() {
public TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() {
return new TomcatWebSocketReactiveWebServerCustomizer();
}

Expand Down
7 changes: 4 additions & 3 deletions ...ringframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
* @author Dave Syer
* @author Phillip Webb
* @author Andy Wilkinson
* @author Artsiom Yudovin
*/
@Configuration
@ConditionalOnClass({ Servlet.class, ServerContainer.class })
Expand All @@ -63,7 +64,7 @@ static class TomcatWebSocketConfiguration {

@Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public TomcatWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
public TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new TomcatWebSocketServletWebServerCustomizer();
}

Expand All @@ -75,7 +76,7 @@ static class JettyWebSocketConfiguration {

@Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public JettyWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
public JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new JettyWebSocketServletWebServerCustomizer();
}

Expand All @@ -87,7 +88,7 @@ static class UndertowWebSocketConfiguration {

@Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public UndertowWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
public UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new UndertowWebSocketServletWebServerCustomizer();
}

Expand Down