mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 14:25:37 +02:00
Code Issues Wiki Activity

Bug 453398: NPE in SupplierBasedCdtVariableSubstitutor ("Expand

Browse source 
env.variable refs")

Change-Id: I4ff9f5191ac5ffe5e5b34b8aba7758aa4965b213
Signed-off-by: Andrew Gvozdev <angvoz.dev@gmail.com>
Reviewed-on: https://git.eclipse.org/r/39047
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
Tested-by: Hudson CI
This commit is contained in:
Andrew Gvozdev 2015-01-06 10:04:34 -05:00
parent 765d9bf16e
commit daa20f98b4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java
View file

@ -285,7 +285,11 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor
}
protected ResolvedMacro resolveMacro(String macroName) throws CdtVariableException{
return resolveMacro(SupplierBasedCdtVariableManager.getVariable(macroName,fContextInfo,true));
ICdtVariable variable = SupplierBasedCdtVariableManager.getVariable(macroName,fContextInfo,true);
if (variable == null)
return null;
return resolveMacro(variable);
}
protected ResolvedMacro resolveParentMacro(MacroDescriptor macroDes) throws CdtVariableException{