From 5770fa49b5395d46a6df98d0cedb6d9bed619ea9 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 16 Jun 2015 15:55:26 +0300 Subject: [PATCH] Rollback to 46d7917 --- .../src/com/intellij/execution/impl/RunManagerImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java index 2852b19e080c..539a85ae964d 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java @@ -38,6 +38,7 @@ import com.intellij.util.Function; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; +import com.intellij.util.containers.WeakHashMap; import gnu.trove.THashMap; import gnu.trove.THashSet; import org.jdom.Element; @@ -64,7 +65,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo private final Map myConfigurations = new LinkedHashMap(); // template configurations are not included here private final Map mySharedConfigurations = new THashMap(); - private final Map> myConfigurationToBeforeTasksMap = ContainerUtil.createConcurrentWeakMap(); + private final Map> myConfigurationToBeforeTasksMap = new WeakHashMap>(); // When readExternal not all configuration may be loaded, so we need to remember the selected configuration // so that when it is eventually loaded, we can mark is as a selected. @@ -683,6 +684,8 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo @Override public void loadState(Element parentNode) { + clear(false); + List children = parentNode.getChildren(CONFIGURATION); Element[] sortedElements = children.toArray(new Element[children.size()]); // ensure templates are loaded first