Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fa1577c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fa1577c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fa1577c Branch: refs/heads/trunk Commit: 7fa1577c2d968e10501ee3df1a10361056498b4d Parents: 39bf436 99881b9 Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Fri Apr 7 19:54:19 2017 -0700 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Fri Apr 7 19:55:08 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fa1577c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fa1577c/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 735c7cf,9796bbd..b883497 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2041,7 -2115,10 +2042,8 @@@ public class StorageService extends Not public boolean isRpcReady(InetAddress endpoint) { - return Gossiper.instance.getEndpointStateForEndpoint(endpoint).isRpcReady(); - if (MessagingService.instance().getVersion(endpoint) < MessagingService.VERSION_22) - return true; + EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint); + return state != null && state.isRpcReady(); } /**
