Skip to content

Fix ConcurrentModificationExceptions thrown from BaselineNullAway #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bulldozer-bot merged 2 commits into from
Oct 7, 2022
Merged

Fix ConcurrentModificationExceptions thrown from BaselineNullAway #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9fbf2b
Collect JavaCompile tasks to a List before iterating over it
ash211 Oct 6, 2022
a477298
Add generated changelog entries
svc-changelog Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-2427.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: fix
fix:
description: Fix ConcurrentModificationExceptions thrown from BaselineNullAway
links:
- https://github.com/palantir/gradle-baseline/pull/2427
2 changes: 1 addition & 1 deletion gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineNullAway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void execute(Configuration _files) {

private static boolean anyProjectUsesJava15(Project proj) {
return proj.getAllprojects().stream()
.anyMatch(project -> project.getTasks().withType(JavaCompile.class).stream()
.anyMatch(project -> ImmutableList.copyOf(project.getTasks().withType(JavaCompile.class)).stream()
Copy link
Contributor

@carterkozak carterkozak Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we would be better off replacing the Collection.stream() here using something along these lines:

project.getTasks().withType(JavaCompile.class).matching(comp -> {
  JavaVersion javaVersion = JavaVersion.toVersion(comp.getTargetCompatibility());
  return javaVersion == JavaVersion.VERSION_15;
}).isEmpty()

I suspect the TaskContainer may be a bit smarter about modification within iteration when it controls the iteration rather than returning a stream wrapping a spliterator, but it's difficult to say without a reliable reproducer.

Copy link
Contributor Author

@ash211 ash211 Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this by testing gw classes --stacktrace on my internal failing repo, and that command:

  • fails on com.palantir.baseline:gradle-baseline-java:4.180.0
  • succeeds on com.palantir.baseline:gradle-baseline-java:4.180.0-8-ga477298
  • fails on com.palantir.baseline:gradle-baseline-java:4.180.0-9-g05114a5

So I think the ImmutableList copy approach works and the TaskCollection one doesn't. At least it gets these runs to pass.

.anyMatch(comp -> {
JavaVersion javaVersion = JavaVersion.toVersion(comp.getTargetCompatibility());
return javaVersion == JavaVersion.VERSION_15;
Expand Down