Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify Http2StreamBridgeServerHandler#write #3391

Merged
merged 1 commit into from
Aug 9, 2024
+28 −3
Merged

Simplify Http2StreamBridgeServerHandler#write #3391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions ...or-netty-http/src/main/java/reactor/netty/http/server/Http2StreamBridgeServerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.DecoderResult;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.DefaultHttpContent;
import io.netty.handler.codec.http.DefaultHttpResponse;
import io.netty.handler.codec.http.DefaultLastHttpContent;
import io.netty.handler.codec.http.HttpObject;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
Expand All @@ -46,6 +49,7 @@
import reactor.netty.http.logging.HttpMessageLogFactory;
import reactor.util.annotation.Nullable;

import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
import static reactor.netty.ReactorNetty.format;

/**
Expand Down Expand Up @@ -173,7 +177,24 @@ else if (!pendingResponse) {
@Override
@SuppressWarnings("FutureReturnValueIgnored")
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
if (msg instanceof ByteBuf) {
Class<?> msgClass = msg.getClass();
if (msgClass == DefaultHttpResponse.class) {
//"FutureReturnValueIgnored" this is deliberate
ctx.write(msg, promise);
}
else if (msgClass == DefaultFullHttpResponse.class) {
//"FutureReturnValueIgnored" this is deliberate
ctx.write(msg, promise);
if (HttpResponseStatus.CONTINUE.code() == ((DefaultFullHttpResponse) msg).status().code()) {
return;
}
finalizeResponse(ctx);
}
else if (msg == EMPTY_LAST_CONTENT || msgClass == DefaultLastHttpContent.class) {
ctx.write(msg, promise);
finalizeResponse(ctx);
}
else if (msg instanceof ByteBuf) {
if (!pendingResponse) {
if (HttpServerOperations.log.isDebugEnabled()) {
HttpServerOperations.log.debug(
Expand All @@ -195,9 +216,13 @@ else if (msg instanceof HttpResponse && HttpResponseStatus.CONTINUE.code() == ((
//"FutureReturnValueIgnored" this is deliberate
ctx.write(msg, promise);
if (msg instanceof LastHttpContent) {
pendingResponse = false;
ctx.read();
finalizeResponse(ctx);
}
}
}

void finalizeResponse(ChannelHandlerContext ctx) {
pendingResponse = false;
ctx.read();
}
}