From 013ac41f4b27a8f049394dd5c5f73c2942e7a175 Mon Sep 17 00:00:00 2001
From: twerth <twerth@google.com>
Date: Thu, 9 Aug 2018 01:30:47 -0700
Subject: Remove unused workspace variable.

RELNOTES: None
PiperOrigin-RevId: 208010973
---
 .../java/com/google/devtools/build/lib/runtime/BlazeRuntime.java    | 1 -
 .../java/com/google/devtools/build/lib/server/GrpcServerImpl.java   | 6 +-----
 src/main/java/com/google/devtools/build/lib/server/RPCServer.java   | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'src')

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 cae2e779b1..a729784a4c 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
@@ -930,7 +930,6 @@ public final class BlazeRuntime {
                 dispatcher,
                 runtime.getClock(),
                 startupOptions.commandPort,
-                runtime.getWorkspace().getWorkspace(),
                 runtime.getServerDirectory(),
                 startupOptions.maxIdleSeconds,
                 startupOptions.idleServerTasks);
diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
index b23d22017c..c0b6e52035 100644
--- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
@@ -156,13 +156,12 @@ public class GrpcServerImpl implements RPCServer {
         BlazeCommandDispatcher dispatcher,
         Clock clock,
         int port,
-        Path workspace,
         Path serverDirectory,
         int maxIdleSeconds,
         boolean idleServerTasks)
         throws IOException {
       return new GrpcServerImpl(
-          dispatcher, clock, port, workspace, serverDirectory, maxIdleSeconds, idleServerTasks);
+          dispatcher, clock, port, serverDirectory, maxIdleSeconds, idleServerTasks);
     }
   }
 
@@ -509,7 +508,6 @@ public class GrpcServerImpl implements RPCServer {
   private final ExecutorService commandExecutorPool;
   private final Clock clock;
   private final Path serverDirectory;
-  private final Path workspace;
   private final String requestCookie;
   private final String responseCookie;
   private final AtomicLong interruptCounter = new AtomicLong(0);
@@ -529,7 +527,6 @@ public class GrpcServerImpl implements RPCServer {
       BlazeCommandDispatcher dispatcher,
       Clock clock,
       int port,
-      Path workspace,
       Path serverDirectory,
       int maxIdleSeconds,
       boolean doIdleServerTasks)
@@ -551,7 +548,6 @@ public class GrpcServerImpl implements RPCServer {
     this.dispatcher = dispatcher;
     this.clock = clock;
     this.serverDirectory = serverDirectory;
-    this.workspace = workspace;
     this.port = port;
     this.maxIdleSeconds = maxIdleSeconds;
     this.serving = false;
diff --git a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
index 9ea22844ee..0b06e5acea 100644
--- a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
+++ b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
@@ -32,7 +32,6 @@ public interface RPCServer {
         BlazeCommandDispatcher dispatcher,
         Clock clock,
         int port,
-        Path workspace,
         Path serverDirectory,
         int maxIdleSeconds,
         boolean idleServerTasks)
-- 
cgit v1.2.3