Merge #2892 into 1.1.11

reactor · Sep 2, 2023 · 202d3ec · 202d3ec
2 parents 073e3b5 + d9b397c
commit 202d3ec
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/server/HttpServerTests.java b/reactor-netty-http/src/test/java/reactor/netty/http/server/HttpServerTests.java
@@ -117,6 +117,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.SignalType;
+import reactor.core.publisher.Sinks;
 import reactor.netty.BaseHttpTest;
 import reactor.netty.ByteBufFlux;
 import reactor.netty.ChannelBindException;
@@ -2223,7 +2224,7 @@ void testSniSupportHandshakeTimeout() {
 				Http11SslContextSpec.forClient()
 				                    .configure(builder -> builder.trustManager(InsecureTrustManagerFactory.INSTANCE));
 
-		AtomicReference<Throwable> error = new AtomicReference<>();
+		Sinks.One<Throwable> error = Sinks.one();
 		disposableServer =
 				createServer()
 				        .childOption(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(64))
@@ -2237,7 +2238,7 @@ void testSniSupportHandshakeTimeout() {
 				                            @Override
 				                            public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
 				                                if (evt instanceof SniCompletionEvent) {
-				                                    error.set(((SniCompletionEvent) evt).cause());
+				                                    error.tryEmitValue(((SniCompletionEvent) evt).cause());
 				                                }
 				                                ctx.fireUserEventTriggered(evt);
 				                            }
@@ -2256,7 +2257,10 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
 		        .expectError()
 		        .verify(Duration.ofSeconds(5));
 
-		assertThat(error.get()).isNotNull().isInstanceOf(SslHandshakeTimeoutException.class);
+		StepVerifier.create(error.asMono())
+		            .expectNextMatches(t -> t instanceof SslHandshakeTimeoutException)
+		            .expectComplete()
+		            .verify(Duration.ofSeconds(10));
 	}
 
 	@Test