bodewig 2004/04/23 00:41:02
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecTask.java Java.java Redirector.java
Log:
merge
Revision Changes Path
No revision
No revision
1.61.2.8 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.61.2.7
retrieving revision 1.61.2.8
diff -u -r1.61.2.7 -r1.61.2.8
--- ExecTask.java 14 Apr 2004 15:42:40 -0000 1.61.2.7
+++ ExecTask.java 23 Apr 2004 07:41:02 -0000 1.61.2.8
@@ -174,7 +174,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= logError;
}
/**
@@ -220,7 +220,7 @@
*/
public void setFailonerror(boolean fail) {
failOnError = fail;
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= fail;
}
/**
@@ -292,8 +292,8 @@
* @param result value desired for the result property value
*/
protected void maybeSetResultPropertyValue(int result) {
- String res = Integer.toString(result);
if (resultProperty != null) {
+ String res = Integer.toString(result);
getProject().setNewProperty(resultProperty, res);
}
}
1.77.2.10 +2 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -r1.77.2.9 -r1.77.2.10
--- Java.java 20 Apr 2004 06:53:29 -0000 1.77.2.9
+++ Java.java 23 Apr 2004 07:41:02 -0000 1.77.2.10
@@ -306,6 +306,7 @@
*/
public void setResultProperty(String resultProperty) {
this.resultProperty = resultProperty;
+ incompatibleWithSpawn = true;
}
/**
@@ -441,7 +442,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= logError;
}
/**
1.11.2.6 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- Redirector.java 22 Apr 2004 21:33:06 -0000 1.11.2.5
+++ Redirector.java 23 Apr 2004 07:41:02 -0000 1.11.2.6
@@ -98,7 +98,7 @@
/** The stream for input */
private InputStream inputStream = null;
- /** Stream which are used for line oriented output */
+ /** Stream which is used for line oriented output */
private PrintStream outPrintStream = null;
/** Stream which is used for line oriented error output */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
