Additional change to the forward port of PR #3031

reactor · Jan 23, 2024 · 12e394c · 12e394c
1 parent 70e71d5
commit 12e394c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/client/Http2Pool.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/client/Http2Pool.java
@@ -999,7 +999,7 @@ boolean goAwayReceived() {
 		ChannelHandlerContext http2FrameCodecCtx() {
 			ChannelHandlerContext ctx = http2FrameCodecCtx;
 			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
-			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
+			if (ctx != null && connection.channel().executor().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(Http2FrameCodec.class);
@@ -1011,7 +1011,7 @@ ChannelHandlerContext http2FrameCodecCtx() {
 		ChannelHandlerContext http2MultiplexHandlerCtx() {
 			ChannelHandlerContext ctx = http2MultiplexHandlerCtx;
 			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
-			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
+			if (ctx != null && connection.channel().executor().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(Http2MultiplexHandler.class);
@@ -1023,7 +1023,7 @@ ChannelHandlerContext http2MultiplexHandlerCtx() {
 		ChannelHandlerContext h2cUpgradeHandlerCtx() {
 			ChannelHandlerContext ctx = h2cUpgradeHandlerCtx;
 			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
-			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
+			if (ctx != null && connection.channel().executor().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(NettyPipeline.H2CUpgradeHandler);