From 4ad7f81c23516c62f72787fdac07916eee5a8828 Mon Sep 17 00:00:00 2001 From: Alex Blewitt Date: Mon, 18 Apr 2016 23:45:20 +0100 Subject: [PATCH] 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 --- .../cdt/managedbuilder/internal/core/ToolReference.java | 7 ++++--- 1 file 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; }