From fcd0216d66a632343ea9f9521b963bb2773bfc33 Mon Sep 17 00:00:00 2001 From: Ivan Ivanoff Date: Tue, 8 Jan 2013 09:24:14 -0500 Subject: [PATCH] bug 397546: NPE at org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab.updateData(LanguageSettingsProviderTab.java:1084) --- .../providers/LanguageSettingsProviderTab.java | 12 +++++++----- 1 file 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 d858baa05ed..bced35b4906 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 initialProviders = ((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders(); - initialProvidersByCfg.put(cfgId, initialProviders); + if (cfgDescription != null) { + String cfgId = cfgDescription.getId(); + if (!initialProvidersByCfg.containsKey(cfgId)) { + if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) { + List initialProviders = ((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders(); + initialProvidersByCfg.put(cfgId, initialProviders); + } } }