GROOVY-11789: do not re-add fatal javac error to ErrorCollector

Author: eric-milles

src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java

@@ -62,18 +62,16 @@ public void compile(List<String> files, CompilationUnit cu) {
         StringBuilderWriter javacOutput = new StringBuilderWriter();
         int javacReturnValue = 0;
         try {
-            try {
-                boolean successful = doCompileWithSystemJavaCompiler(cu, files, javacParameters, javacOutput);
-                if (!successful) {
-                    javacReturnValue = 1;
-                }
-            } catch (IllegalArgumentException e) {
-                javacReturnValue = 2; // any of the options are invalid
-                cu.getErrorCollector().addFatalError(new ExceptionMessage(e, true, cu));
-            } catch (IOException e) {
+            boolean successful = doCompileWithSystemJavaCompiler(cu, files, javacParameters, javacOutput);
+            if (!successful) {
                 javacReturnValue = 1;
-                cu.getErrorCollector().addFatalError(new ExceptionMessage(e, true, cu));
             }
+        } catch (IllegalArgumentException e) {
+            javacReturnValue = 2; // any of the options are invalid
+            cu.getErrorCollector().addFatalError(new ExceptionMessage(e, true, cu));
+        } catch (IOException e) {
+            javacReturnValue = 1;
+            cu.getErrorCollector().addFatalError(new ExceptionMessage(e, true, cu));
         } catch (Exception e) {
             cu.getErrorCollector().addFatalError(new ExceptionMessage(e, true, cu));
         }

subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml

@@ -200,6 +200,15 @@
         <java classname="org.codehaus.groovy.ant.GroovycTest1"/>
     </target>
 
+    <!-- GROOVY-11789 -->
+    <target name="badJavacArgument">
+        <compile-joint includes="**/GroovycTest2.java">
+            <javac>
+                <compilerarg value="-Xlint:xxx"/>
+            </javac>
+        </compile-joint>
+    </target>
+
     <target name="clean">
         <delete quiet="true">
             <fileset dir="${destPath}/org/codehaus/groovy/ant">

subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java

@@ -319,4 +319,14 @@ public void testPlainForkedCompilation_NestingSrcElementCheck() {
         ensureExecutes("plainForkedCompilation_NestingSrcElementCheck");
         ensureNotPresent("GroovycTest2"); // excluded from src > fileset
     }
+
+    // GROOVY-11789
+    public void testBadJavacArgument() {
+        try {
+            project.executeTarget("badJavacArgument");
+            fail("BuildException expected");
+        } catch (BuildException e) {
+            assertTrue(e.getCause().getMessage().contains("invalid flag: -Xlint:xxx"));
+        }
+    }
 }