RecipeMarketplace.Category.merge: copy unmatched source children#7511
Open
natedanner wants to merge 2 commits intomainfrom
Open
RecipeMarketplace.Category.merge: copy unmatched source children#7511natedanner wants to merge 2 commits intomainfrom
natedanner wants to merge 2 commits intomainfrom
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When
Category.mergefinds no name match for a source child, it adopts that child by reference (categories.add(subCategory)). Later merges that name-match into the adopted child then mutate the original source'srecipesandcategories. Most upstream usage hides this —RecipeMarketplace.install(BundleReader)uses a throwaway source — but consumers that cache and reuse aRecipeMarketplaceas a merge source see concurrentConcurrentModificationException/ArrayIndexOutOfBoundsExceptionfrom the sharedArrayLists, and silent state drift across sequential merges.This PR allocates a fresh
Categoryon the receiver and recurses to copy contents instead. The recipes loop was already safe —recipe.withMarketplace(this)returns a new instance.RecipeMarketplaceMergeTestadds two tests pinning the invariant; both fail on parent, pass with the fix. The existing merge tests inRecipeMarketplaceReaderTestonly exercise the name-match path and pass unchanged.