diff options
| author | Markus Schorn | 2012-04-10 11:37:45 +0000 |
|---|---|---|
| committer | Markus Schorn | 2012-04-10 11:37:45 +0000 |
| commit | b2a57f053d773794a78c38f91dff405e8c54401f (patch) | |
| tree | cdfb4a73b184d8b802a289129f084e5a497f3eeb | |
| parent | 886365cedf8d3ef66b3e93670bbd3e3f9f12a48d (diff) | |
| download | org.eclipse.cdt-b2a57f053d773794a78c38f91dff405e8c54401f.tar.gz org.eclipse.cdt-b2a57f053d773794a78c38f91dff405e8c54401f.tar.xz org.eclipse.cdt-b2a57f053d773794a78c38f91dff405e8c54401f.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 fcc17191389..496142cc0ae 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; @@ -484,8 +483,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; @@ -509,7 +506,7 @@ public class PDOMManager implements IWritableIndexManager, IListener { } enqueue(new PDOMRebuildTask(indexer)); } - }} + } if (oldIndexer != null) { stopIndexer(oldIndexer); @@ -542,8 +539,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) @@ -593,14 +588,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) @@ -627,7 +620,7 @@ public class PDOMManager implements IWritableIndexManager, IListener { task= new PDOMRebuildTask(indexer); } enqueue(task); - }} + } } catch (CoreException e) { // Ignore if project is no longer open if (prj.isOpen()) { |