UNDERTOW-2143 Deflaters operate directly on ByteBuffers #1367
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
carterkozak
commented
Aug 24, 2022
Comment on lines
-125
to
-131
| //we may already have some input, if so compress it | ||
| if (!deflater.needsInput()) { | ||
| deflateData(false); | ||
| if (!deflater.needsInput()) { | ||
| return 0; | ||
| } | ||
| } |
There was a problem hiding this comment.
This case is no longer possible because we deflate from a source buffer and return the difference in position (the amount the deflater has consumed), and set an EMPTY buffer to prevent ourselves from leaking references to that buffer. As such, before and after a call to write, the deflater always needs input.
fl4via
requested changes
Oct 11, 2022
| @@ -556,7 +554,6 @@ private void freeBuffer() { | |||
| deflater = null; | |||
| pooledObject.close(); | |||
| } | |||
| IoUtils.safeClose(additionalBuffer); | |||
There was a problem hiding this comment.
I'm missing the points where the buffers are closed? I think you need to close, for example, trailerBuffer here
There was a problem hiding this comment.
trailerBuffer is no longer a pooled buffer, rather the result of ByteBuffer.wrap( on the byte-array result of getTrailer()
fl4via
added
the
waiting PR update
fl4via
approved these changes
Oct 12, 2022
fl4via
removed
the
waiting PR update
carterkozak
force-pushed
the
ckozak/deflater
branch
from
b7eec23
to
2c97a39
Compare
fl4via
added
next release
fl4via
removed
the
next release
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.
Jira: https://issues.redhat.com/browse/UNDERTOW-2143