BTRACE-95: JavacTask may not return failure even though errors are present

jbachorik · jbachorik · commit dc9faca3dc98 · 2013-07-30T22:17:36.000-07:00
Contributed-by: Pavel Nejedly
diff --git a/src/share/classes/com/sun/btrace/compiler/Compiler.java b/src/share/classes/com/sun/btrace/compiler/Compiler.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
@@ -259,7 +260,7 @@ private Map<String, byte[]> compile(MemoryJavaFileManager manager,
         }
 
         // print dignostics messages in case of failures.
-        if (task.call() == false) {
+        if (task.call() == false || containsErrors(diagnostics)) {
             for (Diagnostic diagnostic : diagnostics.getDiagnostics()) {
                 perr.println(diagnostic.getMessage(null));
             }
@@ -291,6 +292,18 @@ private Map<String, byte[]> compile(MemoryJavaFileManager manager,
         }
     }
 
+    /** Checks if the list of diagnostic messages contains at least one error. Certain
+     * {@link JavacTask} implementations may return success error code even though errors were
+     * reported. */
+    private boolean containsErrors(DiagnosticCollector<?> diagnostics) {
+        for (Diagnostic<?> diagnostic : diagnostics.getDiagnostics()) {
+            if (diagnostic.getKind() == Kind.ERROR) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void dump(String name, byte[] code) {
 //        OutputStream os = null;
 //        try {
