From eecd9b3834ee7e45ac4c6f81006e152e12100e9b Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Mon, 18 Jun 2007 11:48:44 +0000 Subject: [PATCH] Fix for [Bug 193007] NPE at Makefile Project preference page on the Mac --- .../internal/dataprovider/ConfigurationDataProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java index 3da6ce0b9ce..a29a99e9ff1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java @@ -409,7 +409,8 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem String langId = type.getLanguageId(tool); if(langId != null){ ILanguageDescriptor des = (ILanguageDescriptor)langMap.remove(langId); - adjustInputType(tool, type, des); + if(des != null) + adjustInputType(tool, type, des); continue; } else { IContentType[] cTypes = type.getSourceContentTypes();