commit 09c80f9e8d6dc768d62e54aaa04e161abe869bc7
author djasper <djasper@google.com> Tue Mar 26 10:38:29 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 26 10:40:23 2019 -0700
tree 24187822411bdbd0a8fb470b632e112def1abdb1
parent 5d022a71ccde24915e083c599e09c96fca4cd038

Properly return 0 when a Bazel-side classpath fallback was requested and is
necessary.

RELNOTES: None.
PiperOrigin-RevId: 240378103

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
index 66d2a6a..f49c487 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.buildjar.javac.BlazeJavacResult;
+import com.google.devtools.build.buildjar.javac.BlazeJavacResult.Status;
 import com.google.devtools.build.buildjar.javac.FormattedDiagnostic;
 import com.google.devtools.build.buildjar.javac.JavacOptions;
 import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
@@ -103,6 +104,9 @@
         }
 
         BlazeJavacResult result = builder.run(build);
+        if (result.status() == Status.REQUIRES_FALLBACK) {
+          return 0;
+        }
         for (FormattedDiagnostic d : result.diagnostics()) {
           err.write(d.getFormatted() + "\n");
         }