suggested changes

Author: AgraVator

netty/src/main/java/io/grpc/netty/NettyClientTransport.java

@@ -350,7 +350,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
 
   @Override
   public void shutdown(Status reason) {
-    shutdown(reason, SimpleDisconnectError.UNKNOWN);
+    shutdown(reason, SimpleDisconnectError.SUBCHANNEL_SHUTDOWN);
   }
 
   @Override
@@ -367,7 +367,7 @@ public void shutdown(Status reason, DisconnectError disconnectError) {
 
   @Override
   public void shutdownNow(final Status reason) {
-    shutdownNow(reason, SimpleDisconnectError.UNKNOWN);
+    shutdownNow(reason, SimpleDisconnectError.SUBCHANNEL_SHUTDOWN);
   }
 
   @Override

okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java

@@ -987,15 +987,7 @@ int getOverridenPort() {
 
   @Override
   public void shutdown(Status reason) {
-    synchronized (lock) {
-      if (goAwayStatus != null) {
-        return;
-      }
-
-      goAwayStatus = reason;
-      listener.transportShutdown(goAwayStatus, SimpleDisconnectError.SUBCHANNEL_SHUTDOWN);
-      stopIfNecessary();
-    }
+    shutdown(reason, SimpleDisconnectError.SUBCHANNEL_SHUTDOWN);
   }
 
   @Override
@@ -1013,12 +1005,12 @@ public void shutdown(Status reason, DisconnectError disconnectError) {
 
   @Override
   public void shutdownNow(Status reason) {
-    shutdownNow(reason, SimpleDisconnectError.UNKNOWN);
+    shutdownNow(reason, SimpleDisconnectError.SUBCHANNEL_SHUTDOWN);
   }
 
   @Override
   public void shutdownNow(Status reason, DisconnectError disconnectError) {
-    shutdown(reason);
+    shutdown(reason, disconnectError);
     synchronized (lock) {
       Iterator<Map.Entry<Integer, OkHttpClientStream>> it = streams.entrySet().iterator();
       while (it.hasNext()) {