fix: leave empty objects in metadata (cherry-pick #213 to main) - #225
Merged
aws-kevinrickard merged 1 commit intoAug 18, 2026
Conversation
By removing empty objects from the metadata we are setting the ShadowDocMetadata field to null which results in a later NullPointerException when building the updated metadata. issue - aws-greengrass#212 (cherry picked from commit 88bccbe)
saranyailla
approved these changes
Aug 18, 2026
kstribrnAmzn
approved these changes
Aug 18, 2026
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.
Cherry-picks #213 ("[Fix] Leave empty objects in metadata",
88bccbeonrelease_2.3.x) ontomain, which does not currently carry the fix.Why
#213 fixes issue #212:
JsonUtil.isMissing()treats empty objects ({}) as missing, soShadowStateMetadata.merge()removes metadata keys whose corresponding state value is{}. When that empties the metadata tree,nullIfEmptyconverts it tonullwhile the state tree is still non-null, and a subsequentgetDelta()throws NullPointerException inbuildMetadata. The fix landed onrelease_2.3.xonly;mainstill has the defect.This also unblocks retargeting #224 (regression tests for the state/metadata invariant) to
main— those tests fail onmaintoday because the fix is absent.Contents
Clean cherry-pick of
88bccbewith original authorship preserved and a(cherry picked from commit ...)trailer. No conflicts — apart from #213,mainandrelease_2.3.xcurrently carry the same changes. No modifications beyond the original commit:ShadowStateMetadata.javaand its test class, as reviewed in #213.Verification
Full test suite on this branch (
main+ this commit):mvn -B test— 597 tests, 0 failures.