From e5a2e5644095a5db0ea4962ebae136e2f0bf69c1 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 11 May 2012 16:21:22 -0400 Subject: [PATCH] bug 378978: [sd90] Internal error during serialization of language settings after build has completed --- .../providers/LanguageSettingsProvidersSerializer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java index 7a699d3e6b3..1b90a90267b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java @@ -28,8 +28,6 @@ import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsStorage; import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICProjectDescription; @@ -924,7 +922,7 @@ public class LanguageSettingsProvidersSerializer { } } if (folder.isAccessible()) { - rule = fileStorePrj; + rule = folder; } } if (rule == null) {