summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Ivanoff2013-01-08 09:24:14 (EST)
committer Andrew Gvozdev2013-01-08 09:40:49 (EST)
commitbfc6041c835cedf5539306e2ef37b6ea1bc64a15 (patch)
tree11b07e375d9b8bd18f6caca9c77119a2fb1f8c1a
parentdc8b82fac298714c8c9ddbec838328f381b9317e (diff)
downloadorg.eclipse.cdt-bfc6041c835cedf5539306e2ef37b6ea1bc64a15.zip
org.eclipse.cdt-bfc6041c835cedf5539306e2ef37b6ea1bc64a15.tar.gz
org.eclipse.cdt-bfc6041c835cedf5539306e2ef37b6ea1bc64a15.tar.bz2
bug 397546: NPE at org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab.updateData(LanguageSettingsProviderTab.java:1084)
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
index d858baa..bced35b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
@@ -1081,11 +1081,13 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
return;
ICConfigurationDescription cfgDescription = getConfigurationDescription();
- String cfgId = cfgDescription.getId();
- if (!initialProvidersByCfg.containsKey(cfgId)) {
- if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) {
- List<ILanguageSettingsProvider> initialProviders = ((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders();
- initialProvidersByCfg.put(cfgId, initialProviders);
+ if (cfgDescription != null) {
+ String cfgId = cfgDescription.getId();
+ if (!initialProvidersByCfg.containsKey(cfgId)) {
+ if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) {
+ List<ILanguageSettingsProvider> initialProviders = ((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders();
+ initialProvidersByCfg.put(cfgId, initialProviders);
+ }
}
}