cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/6] git commit: Don't shutdown a nonexistant native server on 1.2, either.
Date Tue, 14 Jan 2014 21:22:06 GMT
Don't shutdown a nonexistant native server on 1.2, either.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d38b25f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d38b25f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d38b25f

Branch: refs/heads/cassandra-2.0
Commit: 0d38b25f6fa3b7b52f5e64780f6591eabc7fc76d
Parents: 3405878
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Jan 14 15:19:51 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Jan 14 15:19:51 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/0d38b25f/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 5ae02e9..043a1eb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -355,7 +355,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()


Mime
View raw message