diff options
| author | Markus Schorn | 2012-04-04 15:18:30 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2012-04-06 17:42:40 +0000 |
| commit | 9c2b66cf03f5423013365c0db8890a801b45a876 (patch) | |
| tree | e0046650ec9ee265d6b748df71bc76c3924e3583 | |
| parent | b4481a57738de0d1829402c02dbaf7eec6167d6a (diff) | |
| download | org.eclipse.cdt-9c2b66cf03f5423013365c0db8890a801b45a876.tar.gz org.eclipse.cdt-9c2b66cf03f5423013365c0db8890a801b45a876.tar.xz org.eclipse.cdt-9c2b66cf03f5423013365c0db8890a801b45a876.zip | |
| -rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java index d79b5dd70f6..09a72dba2c4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java @@ -85,7 +85,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -495,8 +494,6 @@ public class PDOMManager implements IWritableIndexManager, IListener { String newid= IndexerPreferences.get(prj, IndexerPreferences.KEY_INDEXER_ID, IPDOMManager.ID_NO_INDEXER); Properties props= IndexerPreferences.getProperties(prj); - // Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=359485 - synchronized (new ProjectScope(prj).getNode(CCorePlugin.PLUGIN_ID)) { synchronized (fUpdatePolicies) { if (fClosingProjects.contains(prj.getName())) { return; @@ -520,7 +517,7 @@ public class PDOMManager implements IWritableIndexManager, IListener { } enqueue(new PDOMRebuildTask(indexer)); } - }} + } if (oldIndexer != null) { stopIndexer(oldIndexer); @@ -553,8 +550,6 @@ public class PDOMManager implements IWritableIndexManager, IListener { assert !Thread.holdsLock(fProjectToPDOM); try { - // Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=359485 - synchronized (new ProjectScope(prj).getNode(CCorePlugin.PLUGIN_ID)) { synchronized (fUpdatePolicies) { if (fClosingProjects.contains(name)) { if (fTraceIndexerSetup) @@ -604,14 +599,12 @@ public class PDOMManager implements IWritableIndexManager, IListener { } return; } - }} + } // rebuild is required, try import first. TeamPDOMImportOperation operation= new TeamPDOMImportOperation(project); operation.run(pm); - // Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=359485 - synchronized (new ProjectScope(prj).getNode(CCorePlugin.PLUGIN_ID)) { synchronized (fUpdatePolicies) { if (fClosingProjects.contains(name)) { if (fTraceIndexerSetup) @@ -640,7 +633,7 @@ public class PDOMManager implements IWritableIndexManager, IListener { } enqueue(task); } - }} + } } catch (CoreException e) { // Ignore if project is no longer open if (prj.isOpen()) { |