Skip to main content
summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Johnston2018-10-12 13:09:43 -0400
committerJeff Johnston2018-10-12 13:14:52 -0400
commitc9eee479b4c714509e1b006063a4cbdaeed9cdc4 (patch)
tree2b9a0c0242765a2f0ba22903b30007663361960a /core
parentefbda46cba9dbb17eaebf74013021ea1ab8114fb (diff)
downloadorg.eclipse.cdt-c9eee479b4c714509e1b006063a4cbdaeed9cdc4.tar.gz
org.eclipse.cdt-c9eee479b4c714509e1b006063a4cbdaeed9cdc4.tar.xz
org.eclipse.cdt-c9eee479b4c714509e1b006063a4cbdaeed9cdc4.zip
Bug 540085 - Deadlock in ToolChainManager init
- modify ContainerGCCToolChainProvider.init so that the CBuildConfigurationManager.recheckConfigs() call is done within a separate job so the init() call will return without causing deadlock - do the same for ContainerTargetTypeProvider - modify CBuildConfigurationManager initProviders() method to be synchronized Change-Id: I4ca9371fb340887233872b6d315621a24450fb2b
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/CBuildConfigurationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/CBuildConfigurationManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/CBuildConfigurationManager.java
index eaa35c8ec4..f46b06675a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/CBuildConfigurationManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/CBuildConfigurationManager.java
@@ -101,7 +101,7 @@ public class CBuildConfigurationManager implements ICBuildConfigurationManager,
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
}
- private void initProviders() {
+ private synchronized void initProviders() {
if (providers == null) {
providers = new HashMap<>();

Back to the top