From 8bb961660c759f1294bc96368580c5d6ca7d385c Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 27 Oct 2010 02:20:41 +0000 Subject: [PATCH] bug 328780: NPE when compiler options are displayed --- .../core/ManagedCommandLineGenerator.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java index 8306d5ad0e7..12b39c9f5ea 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java @@ -77,16 +77,18 @@ public class ManagedCommandLineGenerator implements outputName = DOUBLE_QUOTE + outputName + DOUBLE_QUOTE; String inputsStr=""; //$NON-NLS-1$ - for (String inp : inputResources) { - if(inp!=null && inp.length()>0) { - // if the input resource isn't a variable then quote it - if(inp.indexOf("$(") != 0) { //$NON-NLS-1$ - inp = DOUBLE_QUOTE + inp + DOUBLE_QUOTE; + if (inputResources!=null) { + for (String inp : inputResources) { + if(inp!=null && inp.length()>0) { + // if the input resource isn't a variable then quote it + if(inp.indexOf("$(") != 0) { //$NON-NLS-1$ + inp = DOUBLE_QUOTE + inp + DOUBLE_QUOTE; + } + inputsStr = inputsStr + inp + WHITESPACE; } - inputsStr = inputsStr + inp + WHITESPACE; } + inputsStr = inputsStr.trim(); } - inputsStr = inputsStr.trim(); String flagsStr = stringArrayToString(flags);