cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/6] git commit: Fix NPE in nodetool on booting instances. Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968
Date Fri, 13 Sep 2013 17:19:29 GMT
Updated Branches:
  refs/heads/cassandra-1.2 0e18f23c5 -> 08c07f5f3
  refs/heads/cassandra-2.0 1daf19165 -> c9f4f0d64
  refs/heads/trunk d141daa20 -> 19c9a1ef4


Fix NPE in nodetool on booting instances.
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968


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

Branch: refs/heads/cassandra-1.2
Commit: 08c07f5f323a30926fdb760a01b7ef993693153c
Parents: 0e18f23
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Sep 13 12:17:37 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Sep 13 12:17:37 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08c07f5f/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 7a5bbbc..7967dee 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -323,7 +323,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
 
     public boolean isRPCServerRunning()
     {
-        if (daemon == null)
+        if ((daemon == null) || (daemon.thriftServer == null))
         {
             return false;
         }
@@ -358,7 +358,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
 
     public boolean isNativeTransportRunning()
     {
-        if (daemon == null)
+        if ((daemon == null) || (daemon.nativeServer == null))
         {
             return false;
         }


Mime
View raw message