Fix fetching body content after buffer has been read #1778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gavinbunney
requested review from
jguerra,
argha-c,
lindseyreynolds and
AlexanderEllis
argha-c
reviewed
May 24, 2024
| final byte[] body = new byte[size]; | ||
| int offset = 0; | ||
| for (final HttpContent chunk : bodyChunks) { | ||
| final ByteBuf content = chunk.content(); | ||
| final int len = content.readableBytes(); | ||
| content.getBytes(content.readerIndex(), body, offset, len); | ||
| final int len = content.writerIndex(); // writer idx tracks the total readable bytes in the buffer |
There was a problem hiding this comment.
If we do this, let's at least indicate in the comments that the API shall always return the complete buffered body, and not the pending readable bytes. Same for getBodyLength()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When fetching the body content of a
ZuulMessage, the returned content differs based on if the body content chunks have been read, i.e. after it has been proxied to an upstream origin.This change uses the
writerIndexto instead track the total number of readable bytes of the bytebuf, so the entire content is always returned by thegetBody*methods.