diff options
| author | Oleg Krasilnikov | 2007-09-12 06:41:39 +0000 |
|---|---|---|
| committer | Oleg Krasilnikov | 2007-09-12 06:41:39 +0000 |
| commit | cb794af01816d417e70d7bc3cd9c7852d589d7ba (patch) | |
| tree | a7ba30f97ed36df0555dd4a74978f074b86cc304 /build | |
| parent | 80b354c6dd3dd7d4a2cce126ed8e6141b51af298 (diff) | |
| download | org.eclipse.cdt-cb794af01816d417e70d7bc3cd9c7852d589d7ba.tar.gz org.eclipse.cdt-cb794af01816d417e70d7bc3cd9c7852d589d7ba.tar.xz org.eclipse.cdt-cb794af01816d417e70d7bc3cd9c7852d589d7ba.zip | |
Avoid NPEs when Collector is not defined.
Diffstat (limited to 'build')
2 files changed, 4 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java index 33e4c28d448..85f51517275 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java @@ -97,7 +97,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser { Map scannerInfo = new HashMap(); scannerInfo.put(ScannerInfoTypes.INCLUDE_PATHS, includes); scannerInfo.put(ScannerInfoTypes.SYMBOL_DEFINITIONS, symbols); - fCollector.contributeToScannerConfig(fProject, scannerInfo); + if (fCollector != null) fCollector.contributeToScannerConfig(fProject, scannerInfo); TraceUtil.outputTrace("Scanner info from \'specs\' file", //$NON-NLS-1$ "Include paths", includes, new ArrayList(), "Defined symbols", symbols); //$NON-NLS-1$ //$NON-NLS-2$); } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java index 62b37fa9e92..22946ec8437 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java @@ -63,6 +63,9 @@ public class GCCSpecsRunSIProvider extends DefaultRunSIProvider { * @see org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider#prepareArguments(boolean) */ protected String[] prepareArguments(boolean isDefaultCommand) { + if (collector == null) + return fCompileArguments; + List tso = collector.getCollectedScannerInfo(resource.getProject(), ScannerInfoTypes.TARGET_SPECIFIC_OPTION); if (tso == null || tso.size() == 0) { return fCompileArguments; |