Skip to next bundle on predicate failure. #78
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
| if (symbolicName!=null && !symbolicName.equals(b.getSymbolicName())) continue; | ||
| if (version!=null && !Version.parseVersion(version).equals(b.getVersion())) continue; | ||
| for (Predicate<? super Bundle> predicate: predicates) { | ||
| if (!predicate.apply(b)) continue; | ||
| if (!predicate.apply(b)) continue allBundles; |
There was a problem hiding this comment.
Could Predicates.and be used instead of the nested loop? Alternatively can you extract it in a separate method to avoid dealing with labels.
There was a problem hiding this comment.
+1 i don't like labels here, and in any case i think the inner loop as svet suggests can be replaced by one line
if (!Predicates.and(predicates).apply(b)) continue;
There was a problem hiding this comment.
sounds like a fix to me! will add that soon.
Without this change, if the predicate fails, the code flow just picks the next predicate to check, when really we want to skip to checking the next bundle.
geomacy
changed the title
|
Have rebased and pushed the change suggested. |
|
Kicked a new build due to the unrelated failure. |
|
Did this not complete? The build seems to have finished successfully. |
|
Trying a recycle |
|
Reopening |
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.
Without this change, if the predicate fails, the code flow just picks the next predicate to check,
when really we want to skip to checking the next bundle.