Browse Source

Rollback temporarily the setting of new permissions when failonerror="true"

and fork="false"


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275155 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
1df7fd17ca
3 changed files with 7 additions and 4 deletions
  1. +3
    -2
      docs/manual/CoreTasks/java.html
  2. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/Java.java
  3. +2
    -1
      src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java

+ 3
- 2
docs/manual/CoreTasks/java.html View File

@@ -88,7 +88,7 @@ JVM.
<tr>
<td valign="top">failonerror</td>
<td valign="top">Stop the buildprocess if the command exits with a
returncode other than 0. Default is "false"(see <a href="#failonerror">note</a>)</td>
returncode other than 0. Default is "false"<!--(see <a href="#failonerror">note)--></a></td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -220,12 +220,13 @@ see <a href="../CoreTypes/permissions.html">permissions</a></p>
<p>When the permission RuntimePermission exitVM has not been granted (or has
been revoked) the System.exit() call will be intercepted
and treated like indicated in <i>failonerror</i>.</p>
<!--
<p><a name="failonerror"/>
If you specify <code>failonerror=&quot;true&quot;</code> and you do not specify permissions,
a set of default permissions will be added to your java invocation making sure that
a non zero return code will lead to a <code>BuildException</code>.
</p>
-->
<p>Settings will be ignored if fork is enabled.</p>

<p><em>since Ant 1.6</em>.</p>


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

@@ -180,12 +180,13 @@ public class Java extends Task {
log("bootclasspath ignored when same JVM is used.",
Project.MSG_WARN);
}
/*
if (perm == null && failOnError == true) {
perm = new Permissions();
log("running " + this.cmdl.getClassname()
+ " with default permissions (exit forbidden)", Project.MSG_VERBOSE);
}
*/
log("Running in same VM " + cmdl.describeJavaCommand(),
Project.MSG_VERBOSE);
}


+ 2
- 1
src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java View File

@@ -195,7 +195,7 @@ public class JavaTest extends BuildFileTest {
executeTarget("testResultPropertyNonZeroNoFork");
assertEquals("-1",project.getProperty("exitcode"));
}
/*
public void testRunFailWithFailOnError() {
expectBuildExceptionContaining("testRunFailWithFailOnError",
"non zero return code",
@@ -205,6 +205,7 @@ public class JavaTest extends BuildFileTest {
public void testRunSuccessWithFailOnError() {
executeTarget("testRunSuccessWithFailOnError");
}
*/
public void testSpawn() {
FileUtils fileutils = FileUtils.newFileUtils();
File logFile = fileutils.createTempFile("spawn","log", project.getBaseDir());


Loading…
Cancel
Save