You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2013/06/18 17:25:19 UTC
svn commit: r1494173 - in /ant/core/trunk: WHATSNEW
src/main/org/apache/tools/ant/taskdefs/ExecTask.java
src/main/org/apache/tools/ant/taskdefs/Java.java
Author: bodewig
Date: Tue Jun 18 15:25:19 2013
New Revision: 1494173
URL: http://svn.apache.org/r1494173
Log:
sometimes setting a flag isn't incompatible with spawn. PR 55112
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
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?rev=1494173&r1=1494172&r2=1494173&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jun 18 15:25:19 2013
@@ -15,6 +15,11 @@ Fixed bugs:
* TarInputStream should now properly read GNU longlink entries' names.
Bugzilla Report 55040.
+ * <java> and <exec> used to be too restrictive when evaluating
+ whether a given set of options is compatible with spawning the new
+ process.
+ Bugzilla Report 55112.
+
Other changes:
--------------
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java?rev=1494173&r1=1494172&r2=1494173&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java Tue Jun 18 15:25:19 2013
@@ -114,7 +114,7 @@ public class ExecTask extends Task {
*/
public void setTimeout(Long value) {
timeout = value;
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= timeout != null;
}
/**
@@ -363,7 +363,7 @@ public class ExecTask extends Task {
*/
public void setFailIfExecutionFails(boolean flag) {
failIfExecFails = flag;
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= flag;
}
/**
@@ -376,7 +376,7 @@ public class ExecTask extends Task {
*/
public void setAppend(boolean append) {
redirector.setAppend(append);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= append;
}
/**
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?rev=1494173&r1=1494172&r2=1494173&view=diff
==============================================================================
--- 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 Tue Jun 18 15:25:19 2013
@@ -619,7 +619,7 @@ public class Java extends Task {
*/
public void setAppend(boolean append) {
redirector.setAppend(append);
- incompatibleWithSpawn = true;
+ incompatibleWithSpawn |= append;
}
/**