Skip to content

servlet: Register response trailers before stream writes #13029

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

Open
NianJiuZst wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

servlet: Register response trailers before stream writes #13029

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
3 changes: 2 additions & 1 deletion servlet/src/main/java/io/grpc/servlet/ServletServerStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ final class ServletServerStream extends AbstractServerStream {
this.resp = (HttpServletResponse) asyncCtx.getResponse();
this.writer = new AsyncServletOutputStreamWriter(
asyncCtx, transportState, logId);
// Register before the peer can reset the stream and cause the container to commit the response.
resp.setTrailerFields(sink.trailerSupplier);
resp.getOutputStream().setWriteListener(new GrpcWriteListener());
}

Expand Down Expand Up @@ -231,7 +233,6 @@ private final class Sink implements AbstractServerStream.Sink {
@Override
public void writeHeaders(Metadata headers, boolean flush) {
writeHeadersToServletResponse(headers);
resp.setTrailerFields(trailerSupplier);
try {
writer.flush();
} catch (IOException e) {
Expand Down
Loading