Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2013-07-12 16:00:36 +0000
committerAndrew Gvozdev2013-07-12 16:01:48 +0000
commit8134c7e1cda8b91227020c71549b58466a1c552c (patch)
tree978dc863fb0042a723b0efa1e39de6b844d2b35f
parentd6e51c57a9cb1d4a4c295ea6adf4454d86ee06b1 (diff)
downloadorg.eclipse.cdt-8134c7e1cda8b91227020c71549b58466a1c552c.tar.gz
org.eclipse.cdt-8134c7e1cda8b91227020c71549b58466a1c552c.tar.xz
org.eclipse.cdt-8134c7e1cda8b91227020c71549b58466a1c552c.zip
Fixed NPE in ToolchainBuiltinSpecsDetector for an edge case when no tool is defined in a toolchain.
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java
index 2a2322d3aa7..e66575db44c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java
@@ -92,7 +92,7 @@ public abstract class ToolchainBuiltinSpecsDetector extends AbstractBuiltinSpecs
@Override
protected String getCompilerCommand(String languageId) {
ITool tool = getTool(languageId);
- String compilerCommand = tool.getToolCommand();
+ String compilerCommand = tool != null ? tool.getToolCommand() : ""; //$NON-NLS-1$
if (compilerCommand.isEmpty()) {
ManagedBuilderCorePlugin.error("Unable to find compiler command in toolchain=" + getToolchainId()); //$NON-NLS-1$
}
@@ -103,7 +103,7 @@ public abstract class ToolchainBuiltinSpecsDetector extends AbstractBuiltinSpecs
protected String getSpecFileExtension(String languageId) {
String ext = null;
ITool tool = getTool(languageId);
- String[] srcFileExtensions = tool.getAllInputExtensions();
+ String[] srcFileExtensions = tool != null ? tool.getAllInputExtensions() : null;
if (srcFileExtensions != null && srcFileExtensions.length > 0) {
ext = srcFileExtensions[0];
}

Back to the top