do not start server if shutdown requested (+ not in batch mode)

PiperOrigin-RevId: 201144030
ArielleA · Jun 19, 2018 · 2ae255e · 2ae255e
1 parent 78b6563
commit 2ae255e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
@@ -1523,6 +1523,13 @@ int Main(int argc, const char *argv[], WorkspaceLayout *workspace_layout,
   globals->jvm_path = globals->options->GetJvm();
 
   blaze_server->Connect();
+
+  if (!globals->options->batch &&
+      "shutdown" == globals->option_processor->GetCommand() &&
+      !blaze_server->Connected()) {
+    return 0;
+  }
+
   EnsureCorrectRunningVersion(blaze_server);
   KillRunningServerIfDifferentStartupOptions(workspace_layout, blaze_server);