[master] Clone batchQuery to allow for proper nested lazy instantiation #2367
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.
Closes #1998
This PR changes the execution of the batchQuery to utilize a clone for actual execution of the batch fetching. Without the clone it was possible that further batches would overwrite the DataResults of the original batchQuery. These DataResults were then used by the various BatchValueHolders to instantiate the values lazily. However when overwritten the referenced rows had the possibility of not existing in the policy as only the most recently executed batch was present. This could lead to incorrect results being returned.
Once this is reviewed I will back port it.