core: fix ConnectivityStateManager is already disabled bug

core/src/main/java/io/grpc/internal/ConnectivityStateManager.java

@@ -63,7 +63,7 @@ void notifyWhenStateChanged(Runnable callback, Executor executor, ConnectivitySt
    */
   void gotoState(@Nonnull ConnectivityState newState) {
     checkNotNull(newState, "newState");
-    checkState(state != null, "ConnectivityStateManager is already disabled");
+    checkState(!isDisabled(), "ConnectivityStateManager is already disabled");
     gotoNullableState(newState);
   }
 
@@ -102,6 +102,13 @@ void disable() {
     gotoNullableState(null);
   }
 
+  /**
+   * This method is threadsafe.
+   */
+  boolean isDisabled() {
+    return state == null;
+  }
+
   private static final class Listener {
     final Runnable callback;
     final Executor executor;

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

@@ -462,7 +462,9 @@ public ManagedChannelImpl shutdown() {
     channelExecutor.executeLater(new Runnable() {
       @Override
       public void run() {
-        channelStateManager.gotoState(SHUTDOWN);
+        if (!channelStateManager.isDisabled()) {
+          channelStateManager.gotoState(SHUTDOWN);
+        }
       }
     });
 

core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java

@@ -17,12 +17,15 @@
 package io.grpc.internal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import io.grpc.ConnectivityState;
 import java.util.LinkedList;
 import java.util.concurrent.Executor;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -31,6 +34,9 @@
  */
 @RunWith(JUnit4.class)
 public class ConnectivityStateManagerTest {
+  @Rule
+  public final ExpectedException thrown = ExpectedException.none();
+
   private final FakeClock executor = new FakeClock();
   private final ConnectivityStateManager state = new ConnectivityStateManager();
   private final LinkedList<ConnectivityState> sink = new LinkedList<ConnectivityState>();
@@ -223,4 +229,43 @@ public void registerCallbackFromCallbackDirectExecutor() {
     assertEquals(1, sink.size());
     assertEquals(ConnectivityState.READY, sink.poll());
   }
+
+  @Test
+  public void disable() {
+    state.disable();
+    assertTrue(state.isDisabled());
+
+    thrown.expect(UnsupportedOperationException.class);
+    thrown.expectMessage("Channel state API is not implemented");
+    state.getState();
+  }
+
+  @Test
+  public void disableThenDisable() {
+    state.disable();
+    state.disable();
+    assertTrue(state.isDisabled());
+
+    thrown.expect(UnsupportedOperationException.class);
+    thrown.expectMessage("Channel state API is not implemented");
+    state.getState();
+  }
+
+  @Test
+  public void disableThenGotoReady() {
+    state.disable();
+
+    thrown.expect(IllegalStateException.class);
+    thrown.expectMessage("ConnectivityStateManager is already disabled");
+    state.gotoState(ConnectivityState.READY);
+  }
+
+  @Test
+  public void shutdownThenReady() {
+    state.gotoState(ConnectivityState.SHUTDOWN);
+    assertEquals(ConnectivityState.SHUTDOWN, state.getState());
+
+    state.gotoState(ConnectivityState.READY);
+    assertEquals(ConnectivityState.SHUTDOWN, state.getState());
+  }
 }