diff options
| author | Alex Blewitt | 2016-04-18 22:45:20 +0000 |
|---|---|---|
| committer | Alex Blewitt | 2016-04-18 22:45:20 +0000 |
| commit | 4ad7f81c23516c62f72787fdac07916eee5a8828 (patch) | |
| tree | a3a9ee5d191d3f62afda2d95bebd2582aea728f5 /build | |
| parent | 470de4e66b9da836c56b4d3da9bf8c5ceb3387df (diff) | |
| download | org.eclipse.cdt-4ad7f81c23516c62f72787fdac07916eee5a8828.tar.gz org.eclipse.cdt-4ad7f81c23516c62f72787fdac07916eee5a8828.tar.xz org.eclipse.cdt-4ad7f81c23516c62f72787fdac07916eee5a8828.zip | |
Bug 491945 - Refactor ToolReference::getToolCommand()
The implementation of `ToolReference::getToolCommand()` different from its
neighbours by checking if the `parent` was non-null. Change this so it looks for
the `parent` being null and swap the bodies of the `if` statement around to
maintain compatibility.
Change-Id: I8a188b350f94db9b1bd9d240b7a7320a930280a2
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java index 5592f6514f8..cd68e946571 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java @@ -464,10 +464,11 @@ public class ToolReference implements IToolReference { public String getToolCommand() { if (command == null) { // see if the parent has one - if (parent != null) { - return parent.getToolCommand(); + if (parent == null) { + // bad reference + return ""; // $NON-NLS-1$ } - return ""; // bad reference // $NON-NLS-1$ + return parent.getToolCommand(); } return command; } |