Browse Source

sometimes setting a flag isn't incompatible with spawn. PR 55112

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1494173 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 12 years ago
parent
commit
09d19ba100
3 changed files with 9 additions and 4 deletions
  1. +5
    -0
      WHATSNEW
  2. +3
    -3
      src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  3. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Java.java

+ 5
- 0
WHATSNEW View File

@@ -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:
--------------



+ 3
- 3
src/main/org/apache/tools/ant/taskdefs/ExecTask.java View File

@@ -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;
}

/**


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Java.java View File

@@ -619,7 +619,7 @@ public class Java extends Task {
*/
public void setAppend(boolean append) {
redirector.setAppend(append);
incompatibleWithSpawn = true;
incompatibleWithSpawn |= append;
}

/**


Loading…
Cancel
Save