Fix OpenSslClientSessionCache remove #14366
Merged
Conversation
This file contains hidden or 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
Motivation: Loop was adding `nativeSslSession` to the `toBeRemoved` list, instead of the loop variable `sslSession`. Modification: Add the loop variable instead, because the `nativeSslSession` can very likely be null at that point, and is specifically also not the session we want to remove. Result: Fewer bugs in SSL session caching
Scottmitch
approved these changes
Sep 23, 2024
| @@ -99,7 +99,7 @@ boolean setSession(long ssl, OpenSslSession session, String host, int port) { | |||
| if (toBeRemoved == null) { | |||
| toBeRemoved = new ArrayList<NativeSslSession>(2); | |||
| } | |||
| toBeRemoved.add(nativeSslSession); | |||
| toBeRemoved.add(sslSession); | |||
There was a problem hiding this comment.
nit: is there a good way to test for this?
There was a problem hiding this comment.
The tests in #14358 catch it. I'll add a more focused test there.
|
🤦 Thanks for fixing |
normanmaurer
pushed a commit
that referenced
this pull request
Sep 24, 2024
Motivation: Loop was adding `nativeSslSession` to the `toBeRemoved` list, instead of the loop variable `sslSession`. Modification: Add the loop variable instead, because the `nativeSslSession` can very likely be null at that point, and is specifically also not the session we want to remove. Result: Fewer bugs in SSL session caching
normanmaurer
added a commit
that referenced
this pull request
Sep 24, 2024
Motivation: Loop was adding `nativeSslSession` to the `toBeRemoved` list, instead of the loop variable `sslSession`. Modification: Add the loop variable instead, because the `nativeSslSession` can very likely be null at that point, and is specifically also not the session we want to remove. Result: Fewer bugs in SSL session caching Co-authored-by: Chris Vest <[email protected]>
normanmaurer
pushed a commit
that referenced
this pull request
Sep 24, 2024
Motivation: Loop was adding `nativeSslSession` to the `toBeRemoved` list, instead of the loop variable `sslSession`. Modification: Add the loop variable instead, because the `nativeSslSession` can very likely be null at that point, and is specifically also not the session we want to remove. Result: Fewer bugs in SSL session caching
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.
Motivation:
Loop was adding
nativeSslSessionto thetoBeRemovedlist, instead of the loop variablesslSession.Modification:
Add the loop variable instead, because the
nativeSslSessioncan very likely be null at that point, and is specifically also not the session we want to remove.Result:
Fewer bugs in SSL session caching