Fixes #10211 - NPE in ArrayByteBufferPool.findOldestEntry() #10212
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
Fixed algorithm to check for oldest entry to avoid NPE. Added comments for clarity. Signed-off-by: Simone Bordet <[email protected]>
joakime
reviewed
Aug 2, 2023
jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java
Show resolved
Hide resolved
joakime
reviewed
Aug 2, 2023
jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java
Show resolved
Hide resolved
gregw
reviewed
Aug 2, 2023
jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java
Outdated
Show resolved
Hide resolved
jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Simone Bordet <[email protected]>
gregw
reviewed
Aug 2, 2023
Comment on lines
445
to
452
| if (buffer == null) | ||
| continue; | ||
| long age = NanoTime.elapsed(buffer.getLastUpdate(), now); | ||
| if (oldestBuffer != null && age < oldestAge) | ||
| continue; | ||
| oldestEntry = entry; | ||
| oldestBuffer = buffer; | ||
| oldestAge = age; |
There was a problem hiding this comment.
There you go... you can be both consistent and readable:
Suggested change
| if (buffer == null) | |
| continue; | |
| long age = NanoTime.elapsed(buffer.getLastUpdate(), now); | |
| if (oldestBuffer != null && age < oldestAge) | |
| continue; | |
| oldestEntry = entry; | |
| oldestBuffer = buffer; | |
| oldestAge = age; | |
| if (buffer != null) | |
| { | |
| long age = NanoTime.elapsed(buffer.getLastUpdate(), now); | |
| if (oldestBuffer == null || age > oldestAge) | |
| { | |
| oldestEntry = entry; | |
| oldestBuffer = buffer; | |
| oldestAge = age; | |
| } | |
| } |
gregw
previously approved these changes
Aug 2, 2023
|
@sbordet ... and we should add tests for this... but in another later PR is fine |
joakime
reviewed
Aug 2, 2023
| @@ -390,13 +392,14 @@ private void evict(boolean direct, long excess) | |||
|
|
|||
| if (oldestEntry.remove()) | |||
There was a problem hiding this comment.
No null check here?
This same code in jetty-12.0.x has a null check. (yes, i'm aware this PR is for jetty-10.0.x)
There was a problem hiding this comment.
Gee how do you make it include the code here?
There was a problem hiding this comment.
This PR changes ArrayRetainableByteBufferPool.java in jetty-10.0.x and is missing that null check.
There was a problem hiding this comment.
I'm going to retract and get more sleep
Disregard everything I've said in the last hour. :-(
There was a problem hiding this comment.
Signed-off-by: Simone Bordet <[email protected]>
joakime
approved these changes
Aug 2, 2023
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.
Fixed algorithm to check for oldest entry to avoid NPE. Added comments for clarity.