From 07341495e423bf49827aac23812ff5c13a7cf939 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 20 Jun 2013 17:39:08 -0400 Subject: [PATCH] bug 407502: NPE when I open Make Target View --- .../envvar/EnvironmentVariableManagerToolChain.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java index e5d52a004fb..79198eb38ee 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java @@ -138,11 +138,17 @@ public class EnvironmentVariableManagerToolChain extends EnvironmentVariableMana } @Override public ICdtVariable getVariable(String macroName, IVariableContextInfo context) { + if (toolchainSupplier == null) { + return null; + } IEnvironmentVariable var = toolchainSupplier.getVariable(macroName, null, ManagedBuildManager.getEnvironmentVariableProvider()); return CdtVariableManager.fEnvironmentMacroSupplier.createBuildMacro(var); } @Override public ICdtVariable[] getVariables(IVariableContextInfo context) { + if (toolchainSupplier == null) { + return null; + } IEnvironmentVariable[] vars = toolchainSupplier.getVariables(null, ManagedBuildManager.getEnvironmentVariableProvider()); if (vars != null) { ICdtVariable[] cdtVars = new ICdtVariable[vars.length];