cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: fix NPE when stopping nonexistent native server, again.
Date Tue, 04 Feb 2014 17:02:13 GMT
Updated Branches:
  refs/heads/cassandra-2.0 039e9b9a1 -> 723fcd193
  refs/heads/trunk 0842681e2 -> c947c126f


fix NPE when stopping nonexistent native server, again.


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

Branch: refs/heads/cassandra-2.0
Commit: 723fcd1936ad792b8e85490312cbe3edc9d4099e
Parents: 039e9b9
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Feb 4 11:00:04 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Feb 4 11:00:04 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/723fcd19/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 f46ae66..5f9657d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -346,7 +346,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