diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index 860a6e0f6..ab72b5d72 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -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>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index 25e45c5ea..08580227c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -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);
         }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
index 9bf28c5a5..98b14a82f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
@@ -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());