diff options
| author | Matt Benson <mbenson@apache.org> | 2022-02-14 15:18:28 -0600 |
|---|---|---|
| committer | Matt Benson <mbenson@apache.org> | 2022-02-14 15:18:28 -0600 |
| commit | 5fb187d3e6e7cb7f83d3b8ba3b3276f1576dcc35 (patch) | |
| tree | b26e8848e86b5e49e094eb55284d006b4cf003ad | |
| parent | 413f5c0dea3bba8cd2d7f71e65281f0256f77665 (diff) | |
| download | ant-5fb187d3e6e7cb7f83d3b8ba3b3276f1576dcc35.tar.gz | |
fix bug with scriptcondition eval result
| -rw-r--r-- | src/main/org/apache/tools/ant/types/optional/ScriptCondition.java | 2 | ||||
| -rw-r--r-- | src/tests/antunit/types/optional/scriptcondition-test.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java index d3fbe9ea1..51972f70a 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java @@ -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(); } /** diff --git a/src/tests/antunit/types/optional/scriptcondition-test.xml b/src/tests/antunit/types/optional/scriptcondition-test.xml index 16d4af118..40315c162 100644 --- a/src/tests/antunit/types/optional/scriptcondition-test.xml +++ b/src/tests/antunit/types/optional/scriptcondition-test.xml @@ -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> |