Upgrade to Reactor Bismuth snapshots

Towards SR13 to confirm fix for SPR-17306.
2018-10-23 15:49:09 -04:00
parent 6ea3441adf
commit bf4d00cb62
3 changed files with 7 additions and 4 deletions
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
@@ -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));
 		}
 	}