Author: jkf
Date: Sat Jun 30 13:36:13 2007
New Revision: 552208
URL: http://svn.apache.org/viewvc?view=rev&rev=552208
Log:
Br 42377, java, failonerror = false, timeout (or other exception) should have
nonzero result value. (error value chosen in-line with the Exec task).
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=552208&r1=552207&r2=552208
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Jun 30 13:36:13 2007
@@ -16,6 +16,9 @@
* <scriptcondition> now prefers evaluation result/return value over value
property.
+* <java> with fork now returns gives -1 instead of 0 as result when failonerror
+ is false and some exception (including timeout) occurs. Br 42377.
+
Fixed bugs:
-----------
* Regression: Locator fails with URI encoding problem when spaces in path
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java?view=diff&rev=552208&r1=552207&r2=552208
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java Sat Jun 30
13:36:13 2007
@@ -228,7 +228,7 @@
throw e;
} else {
log(e);
- return 0;
+ return -1;
}
} catch (ThreadDeath t) {
throw t; // cf. NB #47191
@@ -237,7 +237,7 @@
throw new BuildException(t, getLocation());
} else {
log(t);
- return 0;
+ return -1;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
