2 files changed, 5 insertions, 5 deletions
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
index 25231366f6..733ecfa823 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -900,7 +900,8 @@ public final class BlazeRuntime {
             "com.google.devtools.build.lib.server.GrpcServerImpl$Factory");
         RPCServer.Factory factory = (RPCServer.Factory) factoryClass.newInstance();
         return factory.create(commandExecutor, runtime.getClock(),
-            startupOptions.commandPort, runtime.getServerDirectory());
+            startupOptions.commandPort, runtime.getServerDirectory(),
+            startupOptions.maxIdleSeconds);
       } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
         throw new AbruptExitException("gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR);
       }
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index b1d1b65545..786d8b3545 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -136,10 +136,9 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(name = "max_idle_secs",
       defaultValue = "" + (3 * 3600), // NOTE: purely decorative!  See class docstring.
       category = "server startup",
-      help = "The number of seconds the build server will wait idling " +
-             "before shutting down. Note: Blaze will ignore this option " +
-             "unless you are starting a new instance. See also 'blaze help " +
-             "shutdown'.")
+      help = "The number of seconds the build server will wait idling before shutting down. Zero "
+             + "means that the server will never shutdown Note: Blaze will ignore this option "
+             + "unless you are starting a new instance. See also 'blaze help shutdown'.")
   public int maxIdleSeconds;
 
   @Option(name = "batch",