Author: bodewig
Date: Mon Oct 5 04:33:36 2009
New Revision: 821677
URL: http://svn.apache.org/viewvc?rev=821677&view=rev
Log:
fix logging logic
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exit.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exit.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exit.java?rev=821677&r1=821676&r2=821677&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exit.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exit.java Mon Oct 5
04:33:36 2009
@@ -139,10 +139,12 @@
if (message != null && message.trim().length() > 0) {
text = message.trim();
} else {
- if (!testIfCondition()) {
+ if (ifCondition != null && !"".equals(ifCondition)
+ && testIfCondition()) {
text = "if=" + ifCondition;
}
- if (!testUnlessCondition()) {
+ if (unlessCondition != null && !"".equals(unlessCondition)
+ && testUnlessCondition()) {
if (text == null) {
text = "";
} else {
