MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle] concurrent access to cancellation map IDEA-264718

Browse Source 
GitOrigin-RevId: 87ef442bfa21b46354e7c646cdcb00833bff443e
This commit is contained in:
Vladislav.Soroka
2021-03-24 11:56:57 +00:00
committed by intellij-monorepo-bot
parent d54c9842a9
commit 6617e555ea
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+3 -6
View File
@@ -52,7 +52,6 @@ import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper;
import org.jetbrains.plugins.gradle.settings.DistributionType;
import org.jetbrains.plugins.gradle.settings.GradleBuildParticipant;
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings;
import org.jetbrains.plugins.gradle.tooling.serialization.internal.IdeaProjectSerializationService;
import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.jetbrains.plugins.gradle.util.ReflectionTraverser;
@@ -77,7 +76,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
@NotNull private final GradleExecutionHelper myHelper;
private final GradleLibraryNamesMixer myLibraryNamesMixer = new GradleLibraryNamesMixer();
private final MultiMap<ExternalSystemTaskId, CancellationTokenSource> myCancellationMap = MultiMap.create();
private final MultiMap<ExternalSystemTaskId, CancellationTokenSource> myCancellationMap = MultiMap.createConcurrent();
public static final Key<Map<String/* module id */, Pair<DataNode<GradleSourceSetData>, ExternalSourceSet>>> RESOLVED_SOURCE_SETS =
Key.create("resolvedSourceSets");
public static final Key<Map<String/* output path */, Pair<String /* module id*/, ExternalSystemSourceType>>> MODULES_OUTPUTS =
@@ -177,10 +176,8 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
@Override
public boolean cancelTask(@NotNull ExternalSystemTaskId id, @NotNull ExternalSystemTaskNotificationListener listener) {
synchronized (myCancellationMap) {
for (CancellationTokenSource cancellationTokenSource : myCancellationMap.get(id)) {
cancellationTokenSource.cancel();
}
for (CancellationTokenSource cancellationTokenSource : myCancellationMap.get(id)) {
cancellationTokenSource.cancel();
}
return true;
}