You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/09/13 19:19:29 UTC
[1/6] git commit: Fix NPE in nodetool on booting instances. Patch by
Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968
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 <br...@apache.org>
Authored: Fri Sep 13 12:17:37 2013 -0500
Committer: Brandon Williams <br...@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;
}
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19c9a1ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19c9a1ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19c9a1ef
Branch: refs/heads/trunk
Commit: 19c9a1ef4bdef527bd160f3b304e0576a92d9d77
Parents: d141daa c9f4f0d
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 12:18:54 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 12:18:54 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/19c9a1ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[3/6] git commit: Fix NPE in nodetool on booting instances. Patch by
Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968
Posted by br...@apache.org.
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/trunk
Commit: 08c07f5f323a30926fdb760a01b7ef993693153c
Parents: 0e18f23
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 12:17:37 2013 -0500
Committer: Brandon Williams <br...@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;
}
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9f4f0d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9f4f0d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9f4f0d6
Branch: refs/heads/cassandra-2.0
Commit: c9f4f0d644076875b970b2cfc666e00225314fb4
Parents: 1daf191 08c07f5
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 12:18:41 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 12:18:41 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/c9f4f0d6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] git commit: Fix NPE in nodetool on booting instances. Patch by
Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968
Posted by br...@apache.org.
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-2.0
Commit: 08c07f5f323a30926fdb760a01b7ef993693153c
Parents: 0e18f23
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 12:17:37 2013 -0500
Committer: Brandon Williams <br...@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;
}
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9f4f0d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9f4f0d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9f4f0d6
Branch: refs/heads/trunk
Commit: c9f4f0d644076875b970b2cfc666e00225314fb4
Parents: 1daf191 08c07f5
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 12:18:41 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 12:18:41 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/c9f4f0d6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------