Skip to content

Commit 42b7c5a

Browse files
committed
Upgrade to Californium snapshots
Towards Californium SR2 to confirm fix for SPR-17306.
1 parent 1cb08f5 commit 42b7c5a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ext {
3838
kotlinVersion = "1.2.71"
3939
log4jVersion = "2.11.1"
4040
nettyVersion = "4.1.30.Final"
41-
reactorVersion = "Californium-SR1"
41+
reactorVersion = "Californium-BUILD-SNAPSHOT"
4242
rxjavaVersion = "1.3.8"
4343
rxjavaAdapterVersion = "1.2.1"
4444
rxjava2Version = "2.2.3"
@@ -148,6 +148,7 @@ configure(allprojects) { project ->
148148

149149
repositories {
150150
maven { url "https://repo.spring.io/libs-release" }
151+
maven { url "https://repo.spring.io/snapshot" } // Californium snapshots
151152
}
152153

153154
dependencies {

spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,10 @@ private static class SessionClosingHandler implements WebSocketHandler {
197197

198198
@Override
199199
public Mono<Void> handle(WebSocketSession session) {
200-
return Flux.never().mergeWith(session.close(CloseStatus.GOING_AWAY)).then();
200+
return session.send(Flux
201+
.error(new Throwable())
202+
.onErrorResume(ex -> session.close(CloseStatus.GOING_AWAY)) // SPR-17306 (nested close)
203+
.cast(WebSocketMessage.class));
201204
}
202205
}
203206

0 commit comments

Comments
 (0)