Remove unused variables

ejona86 · ejona86 · commit 5487ea8f5451 · 2016-06-24T12:11:03.000-07:00
This fixed a threading issue in ServerImpl because the unused variable
should have been used.
diff --git a/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java b/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java
@@ -70,7 +70,6 @@ public GoogleAuthLibraryCallCredentials(Credentials creds) {
   @Override
   public void applyRequestMetadata(MethodDescriptor<?, ?> method, Attributes attrs,
       Executor appExecutor, final MetadataApplier applier) {
-    Metadata cachedSaved;
     String authority = checkNotNull(attrs.get(ATTR_AUTHORITY), "authority");
     final URI uri;
     try {
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -201,7 +201,7 @@ public ServerImpl shutdownNow() {
     }
     // Short-circuiting not strictly necessary, but prevents transports from needing to handle
     // multiple shutdownNow invocations, between here and the serverShutdown callback.
-    if (serverShutdownCallbackInvoked) {
+    if (savedServerShutdownCallbackInvoked) {
       // Have to call shutdownNow, because serverShutdown callback only called shutdown, not
       // shutdownNow
       for (ServerTransport transport : transportsCopy) {
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java
@@ -38,7 +38,6 @@
 import com.squareup.okhttp.ConnectionSpec;
 
 import io.grpc.NameResolver;
-import io.grpc.internal.ClientTransportFactory;
 import io.grpc.internal.GrpcUtil;
 
 import org.junit.Rule;
@@ -66,7 +65,7 @@ protected String checkAuthority(String authority) {
       }
     };
 
-    ClientTransportFactory factory = builder.overrideAuthority("[invalidauthority")
+    builder.overrideAuthority("[invalidauthority")
         .negotiationType(NegotiationType.PLAINTEXT)
         .buildTransportFactory();
   }
@@ -77,7 +76,7 @@ public void failOverrideInvalidAuthority() {
     thrown.expectMessage("Invalid authority:");
     OkHttpChannelBuilder builder = new OkHttpChannelBuilder("good", 1234);
 
-    ClientTransportFactory factory = builder.overrideAuthority("[invalidauthority")
+    builder.overrideAuthority("[invalidauthority")
         .negotiationType(NegotiationType.PLAINTEXT)
         .buildTransportFactory();
   }
diff --git a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
@@ -166,29 +166,27 @@ public void run() {
   public void disablingInboundAutoFlowControlSuppressesRequestsForMoreMessages()
       throws Exception {
     ArgumentCaptor<ClientCall.Listener<String>> listenerCaptor = ArgumentCaptor.forClass(null);
-    CallStreamObserver<Integer> requestObserver =
-        (CallStreamObserver<Integer>)
-            ClientCalls.asyncBidiStreamingCall(call, new ClientResponseObserver<Integer, String>() {
-              @Override
-              public void beforeStart(ClientCallStreamObserver<Integer> requestStream) {
-                requestStream.disableAutoInboundFlowControl();
-              }
+    ClientCalls.asyncBidiStreamingCall(call, new ClientResponseObserver<Integer, String>() {
+      @Override
+      public void beforeStart(ClientCallStreamObserver<Integer> requestStream) {
+        requestStream.disableAutoInboundFlowControl();
+      }
 
-              @Override
-              public void onNext(String value) {
+      @Override
+      public void onNext(String value) {
 
-              }
+      }
 
-              @Override
-              public void onError(Throwable t) {
+      @Override
+      public void onError(Throwable t) {
 
-              }
+      }
 
-              @Override
-              public void onCompleted() {
+      @Override
+      public void onCompleted() {
 
-              }
-            });
+      }
+    });
     verify(call).start(listenerCaptor.capture(), any(Metadata.class));
     listenerCaptor.getValue().onMessage("message");
     verify(call, times(1)).request(1);
diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
@@ -335,7 +335,6 @@ public void shutdownNowKillsClientStream() throws Exception {
     verify(mockClientTransportListener, timeout(TIMEOUT_MS)).transportInUse(true);
     StreamCreation serverStreamCreation
         = serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
-    ServerStream serverStream = serverStreamCreation.stream;
     ServerStreamListener mockServerStreamListener = serverStreamCreation.listener;
 
     Status status = Status.UNKNOWN.withDescription("test shutdownNow");
@@ -366,7 +365,6 @@ public void shutdownNowKillsServerStream() throws Exception {
     verify(mockClientTransportListener, timeout(TIMEOUT_MS)).transportInUse(true);
     StreamCreation serverStreamCreation
         = serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
-    ServerStream serverStream = serverStreamCreation.stream;
     ServerStreamListener mockServerStreamListener = serverStreamCreation.listener;
 
     serverTransport.shutdownNow(Status.UNKNOWN.withDescription("test shutdownNow"));

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public ServerImpl shutdownNow() {`
`201`	`201`	`}`
`202`	`202`	`// Short-circuiting not strictly necessary, but prevents transports from needing to handle`
`203`	`203`	`// multiple shutdownNow invocations, between here and the serverShutdown callback.`
`204`		`- if (serverShutdownCallbackInvoked) {`
	`204`	`+ if (savedServerShutdownCallbackInvoked) {`
`205`	`205`	`// Have to call shutdownNow, because serverShutdown callback only called shutdown, not`
`206`	`206`	`// shutdownNow`
`207`	`207`	`for (ServerTransport transport : transportsCopy) {`