From 5fb187d3e6e7cb7f83d3b8ba3b3276f1576dcc35 Mon Sep 17 00:00:00 2001
From: Matt Benson <mbenson@apache.org>
Date: Mon, 14 Feb 2022 15:18:28 -0600
Subject: [PATCH] fix bug with scriptcondition eval result

---
 .../org/apache/tools/ant/types/optional/ScriptCondition.java  | 2 +-
 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>