Merge #3031 into 2.0.0-M4

reactor · Jan 18, 2024 · f060045 · f060045
2 parents 11dfee6 + c57f382
commit f060045
Showing 1 changed file with 7 additions and 4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2021-2024 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -998,7 +998,8 @@ boolean goAwayReceived() {
 		@Nullable
 		ChannelHandlerContext http2FrameCodecCtx() {
 			ChannelHandlerContext ctx = http2FrameCodecCtx;
-			if (ctx != null && !ctx.isRemoved()) {
+			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
+			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(Http2FrameCodec.class);
@@ -1009,7 +1010,8 @@ ChannelHandlerContext http2FrameCodecCtx() {
 		@Nullable
 		ChannelHandlerContext http2MultiplexHandlerCtx() {
 			ChannelHandlerContext ctx = http2MultiplexHandlerCtx;
-			if (ctx != null && !ctx.isRemoved()) {
+			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
+			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(Http2MultiplexHandler.class);
@@ -1020,7 +1022,8 @@ ChannelHandlerContext http2MultiplexHandlerCtx() {
 		@Nullable
 		ChannelHandlerContext h2cUpgradeHandlerCtx() {
 			ChannelHandlerContext ctx = h2cUpgradeHandlerCtx;
-			if (ctx != null && !ctx.isRemoved()) {
+			// ChannelHandlerContext.isRemoved is only meant to be called from within the EventLoop
+			if (ctx != null && connection.channel().eventLoop().inEventLoop() && !ctx.isRemoved()) {
 				return ctx;
 			}
 			ctx = connection.channel().pipeline().context(NettyPipeline.H2CUpgradeHandler);