diff options
| author | Andrew Gvozdev | 2013-06-20 21:39:08 +0000 |
|---|---|---|
| committer | Andrew Gvozdev | 2013-06-20 21:40:00 +0000 |
| commit | 07341495e423bf49827aac23812ff5c13a7cf939 (patch) | |
| tree | f0ab1572cc914ad09822789dfa272a86a710331f /build/org.eclipse.cdt.managedbuilder.core | |
| parent | bd43cfa615d340fde95bca263dc8a5bcd5741f36 (diff) | |
| download | org.eclipse.cdt-07341495e423bf49827aac23812ff5c13a7cf939.tar.gz org.eclipse.cdt-07341495e423bf49827aac23812ff5c13a7cf939.tar.xz org.eclipse.cdt-07341495e423bf49827aac23812ff5c13a7cf939.zip | |
bug 407502: NPE when I open Make Target View
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core')
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java | 6 |
1 files changed, 6 insertions, 0 deletions
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]; |