Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent fallback to NoUpgradeStrategyWebSocketService

Browse Source 
Closes gh-33970
This commit is contained in:
Juergen Hoeller
2024-12-04 16:39:41 +01:00
parent 307411631d
commit 58c64cba2c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
View File

@@ -485,9 +485,9 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
try { try {
service = new HandshakeWebSocketService(); service = new HandshakeWebSocketService();
} }
catch (IllegalStateException ex) { catch (Throwable ex) {
// Don't fail, test environment perhaps // Don't fail, test environment perhaps
service = new NoUpgradeStrategyWebSocketService(); service = new NoUpgradeStrategyWebSocketService(ex);
} }
} }
return service; return service;
@@ -608,9 +608,15 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
private static final class NoUpgradeStrategyWebSocketService implements WebSocketService { private static final class NoUpgradeStrategyWebSocketService implements WebSocketService {
private final Throwable ex;
public NoUpgradeStrategyWebSocketService(Throwable ex) {
this.ex = ex;
}
@Override @Override
public Mono<Void> handleRequest(ServerWebExchange exchange, WebSocketHandler webSocketHandler) { public Mono<Void> handleRequest(ServerWebExchange exchange, WebSocketHandler webSocketHandler) {
return Mono.error(new IllegalStateException("No suitable RequestUpgradeStrategy")); return Mono.error(new IllegalStateException("No suitable RequestUpgradeStrategy", this.ex));
} }
} }