Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Krasilnikov2008-02-21 07:20:35 -0500
committerOleg Krasilnikov2008-02-21 07:20:35 -0500
commit79e5f33c6218700084c44986fa6773d424a84287 (patch)
tree3fb2272ebccf85e4b2a0174e1e31bf9a95214d69
parent6b54153645a8d7687a7f0d42286a4cdd962a2fe3 (diff)
downloadorg.eclipse.cdt-79e5f33c6218700084c44986fa6773d424a84287.tar.gz
org.eclipse.cdt-79e5f33c6218700084c44986fa6773d424a84287.tar.xz
org.eclipse.cdt-79e5f33c6218700084c44986fa6773d424a84287.zip
Bug #216996 : Deadlock in CfgDiscoveredPathManager
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java
index d8b5a56d50..6dc36c1ffb 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java
@@ -293,7 +293,8 @@ public class CConfigBasedDescriptor implements ICDescriptor {
}
public Element getProjectData(String id) throws CoreException {
- synchronized(CProjectDescriptionManager.getInstance()){
+ // avoid deadlock by using different lock here.
+ synchronized(fStorageDataElMap /*CProjectDescriptionManager.getInstance()*/){
Element el = (Element)fStorageDataElMap.get(id);
if(el == null || el.getParentNode() == null){
InternalXmlStorageElement storageEl = (InternalXmlStorageElement)fCfgDes.getStorage(id, false);

Back to the top