From 88f7869499d318e0f1b44bb08d45a2be96011d27 Mon Sep 17 00:00:00 2001 From: Ken Ryall Date: Thu, 22 Jan 2009 07:39:45 +0000 Subject: [PATCH] Bug 204663 --- .../internal/core/envvar/BuildSystemEnvironmentSupplier.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java index 40013155331..5bc015b4d3b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java @@ -161,6 +161,8 @@ public class BuildSystemEnvironmentSupplier implements if(context instanceof ICConfigurationDescription){ ICConfigurationDescription cfg = (ICConfigurationDescription)context; + if (cfg.getBuildSetting() == null) + return null; IEnvironmentContributor supplier = cfg.getBuildSetting().getBuildEnvironmentContributor(); if(supplier == null) return null; @@ -178,6 +180,8 @@ public class BuildSystemEnvironmentSupplier implements IEnvironmentVariable variables[] = null; if(context instanceof ICConfigurationDescription){ ICConfigurationDescription cfg = (ICConfigurationDescription)context; + if (cfg.getBuildSetting() == null) + return new IEnvironmentVariable[0]; IEnvironmentContributor supplier = cfg.getBuildSetting().getBuildEnvironmentContributor(); if(supplier == null) return new IEnvironmentVariable[0];