fix: NPE in ResourceService when blob contentLength is null #1971 - #1972
Merged
Merged
Conversation
Guard the nullable contentLength returned by blob-store metadata in toFileMetadata and getResourceStream, instead of unboxing it directly into a primitive long. Reachable whenever a FILE/SKILL resource's Redis cache entry has expired, forcing a cold blob-store metadata read (e.g. the complex-resource sweep's deliberately long grace period guarantees this on every reclaim).
Oleksii-Klimov
previously approved these changes
Sep 14, 2026
This comment has been minimized.
This comment has been minimized.
Oleksii-Klimov
approved these changes
Sep 14, 2026
Contributor
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
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
3 participants
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.
Fixes an NPE where
ResourceService.toFileMetadata/getResourceStreamunboxed a nullable blob-storecontentLengthinto a primitivelong.Applicable issues
Description of changes
toFileMetadata: defaults to0LwhenResult.contentLength()is null instead of unboxing directly.getResourceStream: treats a null blob-metadata content length as "read fully" (routes through the existing cache/full-read path, which derives length from the actual bytes) instead of comparingnull <= maxSizeToCache.ResourceServiceTestthat simulate a blob backend returning a null content length for both code paths; verified they fail without the fix and pass with it.Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.