Fix "Unexpected parent dependency" error #5729
Merged
Conversation
This file contains 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
ljacomet
requested changes
Jun 19, 2018
| @@ -137,8 +139,10 @@ public void failWith(Throwable err) { | |||
| } | |||
|
|
|||
| public void restart() { | |||
| removeFromTargetConfigurations(); | |||
| attachToTargetConfigurations(); | |||
| if (from.isSelected()) { | |||
There was a problem hiding this comment.
If I read this PR correctly for production code, this change is the fix. All the other changes are style or performance related. If that's the case, is it possible to isolate the fix in its own commit?
There was a problem hiding this comment.
Splitted into 2 commits.
In particular, avoid the creation of an iterator when lists are empty.
It was possible for an edge to be reintegrated in the graph even if its source node wasn't selected. This would result in an inconsistency when writing, then reading the generated serialized graph. In particular, when a node had a replacement, an that another edge in the graph caused an upgrade of the source dependency, the older version of the source node could have been seen as selected when it wasn't. Fixes #4785
ljacomet
approved these changes
Jun 19, 2018
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.
Context
It was possible for an edge to be reintegrated in the graph even if its
source node wasn't selected. This would result in an inconsistency when
writing, then reading the generated serialized graph. In particular,
when a node had a replacement, an that another edge in the graph caused
an upgrade of the source dependency, the older version of the source
node could have been seen as selected when it wasn't.
Fixes #4785
This PR is on
master. If everything is fine, I'm going to backport it toreleaseso that it can make it to 4.8.1, but timing is a bit short.