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

Upgrade to Reactor Bismuth snapshots

Browse Source 
Towards SR13 to confirm fix for SPR-17306.
This commit is contained in:
Rossen Stoyanchev
2018-10-23 15:49:09 -04:00
parent 6ea3441adf
commit bf4d00cb62
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
View File

@@ -70,8 +70,7 @@ public class ReactorNettyWebSocketSession
@Override
public Mono<Void> close(CloseStatus status) {
WebSocketFrame closeFrame = new CloseWebSocketFrame(status.getCode(), status.getReason());
return getDelegate().getOutbound().sendObject(closeFrame).then();
return getDelegate().getOutbound().sendClose(status.getCode(), status.getReason());
}

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

@@ -197,7 +197,10 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
@Override
public Mono<Void> handle(WebSocketSession session) {
return Flux.never().mergeWith(session.close(CloseStatus.GOING_AWAY)).then();
return session.send(Flux
.error(new Throwable())
.onErrorResume(ex -> session.close(CloseStatus.GOING_AWAY)) // SPR-17306 (nested close)
.cast(WebSocketMessage.class));
}
}