Automatic code cleanup.

PiperOrigin-RevId: 228130835
bazelbuild · Jan 7, 2019 · 9511099 · 9511099
1 parent eb5598c
commit 9511099
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -226,6 +226,23 @@ public BlazeCommandResult exec(
     }
   }
 
+  /**
+   * For testing ONLY. Same as {@link #exec(InvocationPolicy, List, OutErr, LockingMode, String,
+   * long, Optional<List<Pair<String, String>>>)}, but automatically uses the current time.
+   */
+  @VisibleForTesting
+  public BlazeCommandResult exec(List<String> args, String clientDescription, OutErr originalOutErr)
+      throws InterruptedException {
+    return exec(
+        InvocationPolicy.getDefaultInstance(),
+        args,
+        originalOutErr,
+        LockingMode.ERROR_OUT,
+        clientDescription,
+        runtime.getClock().currentTimeMillis(),
+        Optional.empty() /* startupOptionBundles */);
+  }
+
   private BlazeCommandResult execExclusively(
       OriginalUnstructuredCommandLineEvent unstructuredServerCommandLineEvent,
       InvocationPolicy invocationPolicy,
@@ -526,23 +543,6 @@ private static BlazeCommandResult replayEarlyExitEvents(
     return BlazeCommandResult.exitCode(earlyExitCode);
   }
 
-  /**
-   * For testing ONLY. Same as {@link #exec(InvocationPolicy, List, OutErr, LockingMode, String,
-   * long, Optional<List<Pair<String, String>>>)}, but automatically uses the current time.
-   */
-  @VisibleForTesting
-  public BlazeCommandResult exec(List<String> args, String clientDescription, OutErr originalOutErr)
-      throws InterruptedException {
-    return exec(
-        InvocationPolicy.getDefaultInstance(),
-        args,
-        originalOutErr,
-        LockingMode.ERROR_OUT,
-        clientDescription,
-        runtime.getClock().currentTimeMillis(),
-        Optional.empty() /* startupOptionBundles */);
-  }
-
   private OutErr bufferOut(OutErr outErr, boolean fully) {
     OutputStream wrappedOut;
     if (fully) {

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandResult.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandResult.java
@@ -45,6 +45,10 @@ public boolean shutdown() {
     return shutdown;
   }
 
+  public static BlazeCommandResult shutdown(ExitCode exitCode) {
+    return new BlazeCommandResult(exitCode, null, true);
+  }
+
   @Nullable public ExecRequest getExecRequest() {
     return execDescription;
   }
@@ -53,9 +57,6 @@ public static BlazeCommandResult exitCode(ExitCode exitCode) {
     return new BlazeCommandResult(exitCode, null, false);
   }
 
-  public static BlazeCommandResult shutdown(ExitCode exitCode) {
-    return new BlazeCommandResult(exitCode, null, true);
-  }
   public static BlazeCommandResult execute(ExecRequest execDescription) {
     return new BlazeCommandResult(
         ExitCode.SUCCESS, Preconditions.checkNotNull(execDescription), false);

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -990,7 +990,8 @@ private static int serverMain(Iterable<BlazeModule> modules, OutErr outErr, Stri
                 startupOptions.shutdownOnLowSysMem,
                 startupOptions.idleServerTasks);
       } catch (ReflectiveOperationException | IllegalArgumentException e) {
-        throw new AbruptExitException("gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR);
+        throw new AbruptExitException(
+            "gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR, e);
       }
 
       // Register the signal handler.

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ClientOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/ClientOptions.java
@@ -78,7 +78,7 @@ public OptionOverride convert(String input) throws OptionsParsingException {
       try {
         blazeRc = Integer.valueOf(input.substring(0, colonPos));
       } catch (NumberFormatException e) {
-        throw new OptionsParsingException(ERROR_MESSAGE);
+        throw new OptionsParsingException(ERROR_MESSAGE, e);
       }
 
       if (blazeRc < 0) {