cache: guard null fields in Entry.writeTo() to fix NPE (#8962)#9345
Merged
yschimke merged 2 commits intosquare:masterfrom Mar 20, 2026
Merged
cache: guard null fields in Entry.writeTo() to fix NPE (#8962)#9345yschimke merged 2 commits intosquare:masterfrom
yschimke merged 2 commits intosquare:masterfrom
Conversation
yschimke
approved these changes
Mar 20, 2026
Collaborator
yschimke
left a comment
There was a problem hiding this comment.
I'm not sure if there is a different root cause, that https://example.com:80/ shouldn't match. But this change is an improvement, NPE from our code is bad.
Collaborator
|
Actually |
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
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.
Fix
NullPointerExceptioninCache.Entry.writeTo()when an HTTPS response has a null handshake.Fix
Changed
if (url.isHttps)toif (url.isHttps && handshake != null)so the TLS block is skipped when handshake is absent. The response still succeeds. It just won't be served from cache on subsequent requests.Tests added
Three regression tests in
CacheTest:writeTo().All verified to fail before the fix and pass after.
Fixes #8962