Jetty 12 simplify Retainable.canRetain usage #9159
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
gregw
changed the title
lorban
requested changes
Jan 12, 2023
| */ | ||
| static Chunk asChunk(ByteBuffer byteBuffer, boolean last, Retainable retainable) | ||
| { | ||
| if (!retainable.canRetain()) |
There was a problem hiding this comment.
This is the most important spot where canRetain is used. We must not allow linking the lifecycle of a Chunk that potentially contains a pooled buffer to the lifecycle of non-retaining retainables like EOF or EMPTY.
While this check is a nice to have extra safeguard and the current code would work without it, it was added because that error is way too easy to make and hard to track down.
Base automatically changed from
fix/jetty-12-remove-chunk-isTerminal
to
jetty-12.0.x
January 13, 2023 00:11
`Retainable`s that return false from `canRetain` now are noops if `retain` is called, which allows for a simpler calling convention. AsyncContent has also been reworked to allocate less and be clearer in its use of `canRetain`.
gregw
force-pushed
the
fix/jetty-12-remove-chunk-isTerminal-noRetain
branch
from
0b9f1b4 to
4655b61
Compare
gregw
changed the title
sbordet
approved these changes
Jan 13, 2023
gregpoulos
pushed a commit
to gregpoulos/jetty.project
that referenced
this pull request
Jan 16, 2023
…x-document-modules * upstream/jetty-12.0.x: Issue jetty#9167 - making assumption in flaky test jetty 12.0.x cleanup duplicate osgi pom metadata (jetty#9093) Jetty 12 - Add tests in util/resource for alternate FileSystem implementations (jetty#9149) Cleanup non-retainable `Retainable`s (jetty#9159) Fixes retainability of special Chunks (jetty#9073) TCK: Dispatch forward and includes attributes do not meet the spec (jetty#9074) re-enable h3 tests (jetty#8773) More fundamental test case Reorganization of jetty-client classes. (jetty#9127) Removing @disabled from SslUploadTest Removing @disabled from jetty-start jetty#9134 added test ee10: DefaultServlet: Replace checks for isStreaming() by !isWriting() jetty#9078 make HttpContent.getByteBuffer() implementations return new ByteBuffer instances and document that contract Fixes jetty#9141 - Thread-safe Content.Chunk#slice (jetty#9142) Remove `@Disabled` from `jetty-jmx` (jetty#9143) Bump maven.version from 3.8.6 to 3.8.7 Bump maven.version from 3.8.6 to 3.8.7
gregpoulos
pushed a commit
to gregpoulos/jetty.project
that referenced
this pull request
Jan 16, 2023
… into jetty-12.0.x-documentation-lowercase-jetty_home-attribute * 'jetty-12.0.x' of https://github.com/eclipse/jetty.project: Issue jetty#9167 - making assumption in flaky test jetty 12.0.x cleanup duplicate osgi pom metadata (jetty#9093) Jetty 12 - Add tests in util/resource for alternate FileSystem implementations (jetty#9149) Cleanup non-retainable `Retainable`s (jetty#9159) Fixes retainability of special Chunks (jetty#9073) TCK: Dispatch forward and includes attributes do not meet the spec (jetty#9074) re-enable h3 tests (jetty#8773) More fundamental test case Reorganization of jetty-client classes. (jetty#9127) Removing @disabled from SslUploadTest Removing @disabled from jetty-start Bump maven.version from 3.8.6 to 3.8.7 Bump maven.version from 3.8.6 to 3.8.7
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.
I believe that
canRetainis no longer needed. The only place it is used for real logic is inAsyncContent, which can use it's own chunk class to pass on how to succeed the callback.