Updated Branches: refs/heads/trunk f07aa3999 -> d1361502a
don't stop a native server that doesn't exist Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1361502 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1361502 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1361502 Branch: refs/heads/trunk Commit: d1361502ac45e74b60dcc98046caacb6d483a83d Parents: f07aa39 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 10:23:53 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 10:23:53 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1361502/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 1c4baad..5deaf9e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -341,7 +341,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { throw new IllegalStateException("No configured daemon"); } - daemon.nativeServer.stop(); + if (daemon.nativeServer != null) + daemon.nativeServer.stop(); } public boolean isNativeTransportRunning()
