From bd57216cbf569a93a99d9f7140032d6ecaff6d6d Mon Sep 17 00:00:00 2001 From: mhussein Date: Mon, 14 May 2012 10:56:04 +0300 Subject: [PATCH] Fix Unit test for bug 365718 make getTreeRoot correctly throw an exception if called for non tree nodes. Change-Id: Ief34c469c504cddc0212750bf98f4823774d1990 Reviewed-on: https://git.eclipse.org/r/5969 Reviewed-by: Doug Schaefer IP-Clean: Doug Schaefer Tested-by: Doug Schaefer --- .../eclipse/cdt/managedbuilder/internal/core/Option.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java index 07d69fe1a73..ea8df262477 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java @@ -2975,6 +2975,9 @@ public class Option extends BuildObject implements IOption, IBuildPropertiesRest @Override public ITreeRoot getTreeRoot() throws BuildException { + if (getValueType() != TREE) { + throw new BuildException(ManagedMakeMessages.getResourceString("Option.error.bad_value_type")); //$NON-NLS-1$ + } if (treeRoot == null) { if (superClass != null) { return superClass.getTreeRoot(); @@ -2982,9 +2985,6 @@ public class Option extends BuildObject implements IOption, IBuildPropertiesRest return null; } } - if (getValueType() != TREE) { - throw new BuildException(ManagedMakeMessages.getResourceString("Option.error.bad_value_type")); //$NON-NLS-1$ - } return treeRoot; }