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

added Module component application-wide synchronisation to avoid concurrency problems on parallel loading

Browse Source
This commit is contained in:
Alexandr Evstigneev
2017-04-04 17:49:27 +03:00
parent 4016bad71d
commit c2dd7a98df
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
+13 -4
View File
@@ -42,13 +42,14 @@ import java.util.Set;
@State(name = "ModuleRunConfigurationManager")
public final class ModuleRunConfigurationManager implements PersistentStateComponent<Element> {
private static final Object LOCK = new Object();
private static final Logger LOG = Logger.getInstance(ModuleRunConfigurationManager.class);
@NotNull
private final Module myModule;
@NotNull
private final Condition<RunnerAndConfigurationSettings> myModuleConfigCondition =
settings -> settings != null && usesMyModule(settings.getConfiguration());
@NotNull
private final Module myModule;
@NotNull
private final RunManagerImpl myManager;
@Nullable
private List<Element> myUnloadedElements = null;
@@ -62,8 +63,10 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) {
if (myModule.equals(module)) {
LOG.debug("time to remove something from project (" + project + ")");
for (final RunnerAndConfigurationSettings settings : getModuleRunConfigurationSettings()) {
myManager.removeConfiguration(settings);
synchronized (LOCK) {
for (final RunnerAndConfigurationSettings settings : getModuleRunConfigurationSettings()) {
myManager.removeConfiguration(settings);
}
}
}
}
@@ -117,6 +120,12 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
}
public void readExternal(@NotNull final Element element) {
synchronized (LOCK) {
doReadExternal(element);
}
}
private void doReadExternal(@NotNull Element element) {
LOG.debug("readExternal(" + myModule + ")");
myUnloadedElements = null;
final Set<String> existing = new HashSet<>();