commit 8d487e28ade55330b8a5571aa279ee39cb28f781
author cushon <cushon@google.com> Tue May 12 14:59:09 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 12 14:59:54 2020 -0700
tree 5c7605b2c37d6b5afa844c6ccd7f74c2b1aecd3b
parent 456494a70664d742163079006626786a689a3fcb

Unconditionally fall back to the transitive classpath on *errors*

PiperOrigin-RevId: 311208771

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/FormattedDiagnostic.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/FormattedDiagnostic.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/FormattedDiagnostic.java
index 7ff3a54..b5251b6 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/FormattedDiagnostic.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/FormattedDiagnostic.java
@@ -116,8 +116,8 @@
       String formatted = formatter.format((JCDiagnostic) diagnostic, locale);
       FormattedDiagnostic formattedDiagnostic = new FormattedDiagnostic(diagnostic, formatted);
       diagnostics.add(formattedDiagnostic);
-      if (failFast) {
-        throw new FailFastException();
+      if (failFast && diagnostic.getKind().equals(Diagnostic.Kind.ERROR)) {
+        throw new FailFastException(formatted);
       }
     }
 
@@ -126,5 +126,9 @@
     }
   }
 
-  static class FailFastException extends RuntimeException {}
+  static class FailFastException extends RuntimeException {
+    FailFastException(String message) {
+      super(message);
+    }
+  }
 }