Browse Source

fix bug with scriptcondition eval result

master
Matt Benson 3 years ago
parent
commit
5fb187d3e6
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
  2. +2
    -2
      src/tests/antunit/types/optional/scriptcondition-test.xml

+ 1
- 1
src/main/org/apache/tools/ant/types/optional/ScriptCondition.java View File

@@ -45,7 +45,7 @@ public class ScriptCondition extends AbstractScriptComponent implements Conditio
public boolean eval() throws BuildException {
initScriptRunner();
final Object result = getRunner().evaluateScript("ant_condition");
return Boolean.TRUE.equals(result) || getValue();
return result instanceof Boolean ? Boolean.TRUE.equals(result) : getValue();
}

/**


+ 2
- 2
src/tests/antunit/types/optional/scriptcondition-test.xml View File

@@ -77,11 +77,11 @@
</target>

<target name="test-return-value-false">
<au:assertTrue>
<au:assertFalse>
<scriptcondition language="beanshell" value="true">
false
</scriptcondition>
</au:assertTrue>
</au:assertFalse>
</target>

</project>

Loading…
Cancel
Save