Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2013-09-01 07:16:36 -0400
committerAndrew Gvozdev2013-09-01 07:28:18 -0400
commit7104c1f8e5828a21adf74a88825a91387d857db1 (patch)
treec1a10f5923f6b3128243410342262fc7df579120
parent8a79315e61500242716f9854c5f9bd5a184892a0 (diff)
downloadorg.eclipse.cdt-7104c1f8e5828a21adf74a88825a91387d857db1.tar.gz
org.eclipse.cdt-7104c1f8e5828a21adf74a88825a91387d857db1.tar.xz
org.eclipse.cdt-7104c1f8e5828a21adf74a88825a91387d857db1.zip
bug 415970: Add waitForIndexer() before refreshLocal()
-rw-r--r--core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java
index 36cd3c7e28..6c39f073b5 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java
@@ -1143,6 +1143,8 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
assertTrue("File "+xmlFile+ " does not exist", xmlFile.exists());
assertFalse("File "+xmlFileOut+ " still exist", xmlFileOut.exists());
+ // Wait out in case indexer thread hijacks refreshLocal(), see bug 415970
+ waitForIndexer(CCorePlugin.getDefault().getCoreModel().create(project));
// Refresh storage in workspace
xmlStorageFilePrj.refreshLocal(IResource.DEPTH_ZERO, null);
assertTrue("File "+xmlStorageFilePrj+ " does not exist", xmlStorageFilePrj.exists());
@@ -1372,6 +1374,8 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
assertTrue("File "+xmlFile+ " does not exist", xmlFile.exists());
assertFalse("File "+xmlFileOut+ " still exist", xmlFileOut.exists());
+ // Wait out in case indexer thread hijacks refreshLocal(), see bug 415970
+ waitForIndexer(CCorePlugin.getDefault().getCoreModel().create(project));
// Refresh storage in workspace
xmlStorageFilePrj.refreshLocal(IResource.DEPTH_ZERO, null);
assertTrue("File "+xmlStorageFilePrj+ " does not exist", xmlStorageFilePrj.exists());

Back to the top