| commit | b843fbee111e21a98bddaa1eae0fd6d674ffb394 | [log] [tgz] |
|---|---|---|
| author | cushon <cushon@google.com> | Tue Mar 26 11:20:53 2019 -0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Tue Mar 26 11:22:36 2019 -0700 |
| tree | 27a65ce20e6dc6f8a5244ce16e540455184bfc02 | |
| parent | 67389564c963f24ad7a79adffbf95825ce9b4a88 [diff] |
Unrefactor JavaBuilder exit code handling PiperOrigin-RevId: 240389537
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 f49c487..ef22809 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
@@ -111,7 +111,7 @@ err.write(d.getFormatted() + "\n"); } err.write(result.output()); - return result.status().exitCode(); + return result.isOk() ? 0 : 1; } } catch (InvalidCommandLineException e) { err.println(CMDNAME + " threw exception: " + e.getMessage());
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java index d651ca6..a135718 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java
@@ -23,20 +23,9 @@ public class BlazeJavacResult { /** The compilation result. */ public enum Status { - OK(0), - ERROR(1), - // TODO(djasper): this should be 0 - REQUIRES_FALLBACK(1); - - private final int exitCode; - - private Status(int exitCode) { - this.exitCode = exitCode; - } - - public int exitCode() { - return exitCode; - } + OK, + ERROR, + REQUIRES_FALLBACK, } private final Status status;