This website works better with JavaScript.
Home
Issues
Pull Requests
Milestones
AI流水线
Repositories
Datasets
Forum
实训
竞赛
大数据
Register
Sign In
youys
/
ant
Not watched
Unwatch
Watch all
Watch but not notify
1
Star
0
Fork
1
Code
Releases
0
Wiki
Activity
Issues
0
Pull Requests
0
Datasets
Model
Cloudbrain
Browse Source
fix bug with scriptcondition eval result
master
Matt Benson
3 years ago
parent
413f5c0dea
commit
5fb187d3e6
2 changed files
with
3 additions
and
3 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
+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:assert
Tru
e>
<au:assert
Fals
e>
<scriptcondition language="beanshell" value="true">
false
</scriptcondition>
</au:assert
Tru
e>
</au:assert
Fals
e>
</target>
</project>
Write
Preview
Loading…
Cancel
Save