From 4b27e542e08abe5bccd48ebdc5c4d242fd12f662 Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Mon, 14 Sep 2015 11:39:28 -0700
Subject: [PATCH] Don't let server start if already shutting down

---
 core/src/main/java/io/grpc/internal/ServerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
index 80523832fe..e45a6cecbe 100644
--- a/core/src/main/java/io/grpc/internal/ServerImpl.java
+++ b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -31,6 +31,7 @@
 
 package io.grpc.internal;
 
+import static com.google.common.base.Preconditions.checkState;
 import static io.grpc.internal.GrpcUtil.TIMEOUT_KEY;
 import static io.grpc.internal.GrpcUtil.TIMER_SERVICE;
 
@@ -114,9 +115,8 @@ public final class ServerImpl extends io.grpc.Server {
   @Override
   public ServerImpl start() throws IOException {
     synchronized (lock) {
-      if (started) {
-        throw new IllegalStateException("Already started");
-      }
+      checkState(!started, "Already started");
+      checkState(!shutdown, "Shutting down");
       usingSharedExecutor = executor == null;
       if (usingSharedExecutor) {
         executor = SharedResourceHolder.get(GrpcUtil.SHARED_CHANNEL_EXECUTOR);