Do not close the empty full message when invoking SimpleCompressionHa…

…ndler out of the pipeline
reactor · Sep 21, 2022 · 384d01c · 384d01c
1 parent 95daf6e
commit 384d01c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServerOperations.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServerOperations.java
@@ -524,8 +524,8 @@ else if (channel().pipeline()
 		                  .get(NettyPipeline.CompressionHandler) == null) {
 			SimpleCompressionHandler handler = new SimpleCompressionHandler();
 			try {
-				// decodeAndClose(...) is needed only to initialize the acceptEncodingQueue
-				handler.decodeAndClose(channel().pipeline().context(NettyPipeline.ReactiveBridge), nettyRequest);
+				// decode(...) is needed only to initialize the acceptEncodingQueue
+				handler.decode(channel().pipeline().context(NettyPipeline.ReactiveBridge), nettyRequest, false);
 
 				addHandlerFirst(NettyPipeline.CompressionHandler, handler);
 			}

diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/SimpleCompressionHandler.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/SimpleCompressionHandler.java
@@ -37,8 +37,7 @@ public Future<Void> write(ChannelHandlerContext ctx, Object msg) {
 		return super.write(ctx, msg);
 	}
 
-	@Override
-	protected void decodeAndClose(ChannelHandlerContext ctx, HttpRequest msg) throws Exception {
+	void decode(ChannelHandlerContext ctx, HttpRequest msg, boolean release) throws Exception {
 		HttpRequest request = msg;
 		if (msg instanceof FullHttpRequest fullHttpRequest &&
 				(!fullHttpRequest.isAccessible() || fullHttpRequest.payload().readableBytes() == 0)) {
@@ -48,7 +47,15 @@ protected void decodeAndClose(ChannelHandlerContext ctx, HttpRequest msg) throws
 			// 2. fireChannelRead(...) is invoked at the end of super.decodeAndClose(...) which will end up
 			// in io.netty5.channel.DefaultChannelPipeline.onUnhandledInboundMessage which closes the msg.
 			request = new DefaultHttpRequest(msg.protocolVersion(), msg.method(), msg.uri(), msg.headers());
+			if (release && fullHttpRequest.isAccessible()) {
+				fullHttpRequest.close();
+			}
 		}
 		super.decodeAndClose(ctx, request);
 	}
+
+	@Override
+	protected void decodeAndClose(ChannelHandlerContext ctx, HttpRequest msg) throws Exception {
+		decode(ctx, msg, true);
+	}
 }