Don't NPE when shutting down non-existent thrift server

2013-10-24 09:56:38 -05:00 · 2013-10-24 09:56:38 -05:00 · 9eddaa8ffa
parent c040759da5
commit 9eddaa8ffa
1 changed files with 2 additions and 1 deletions
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@ -318,7 +318,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
        {
            throw new IllegalStateException("No configured daemon");
        }
-        daemon.thriftServer.stop();
+        if (daemon.thriftServer != null)
+            daemon.thriftServer.stop();
    }

    public boolean isRPCServerRunning()