Repository: cassandra Updated Branches: refs/heads/trunk 56ea68ef7 -> 633babf0f
Fix NPE after CASSANDRA-12929 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/633babf0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/633babf0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/633babf0 Branch: refs/heads/trunk Commit: 633babf0f02fac56cad7bff03a4ff415feb38f39 Parents: 56ea68e Author: Yuki Morishita <yu...@apache.org> Authored: Tue Apr 4 16:56:14 2017 +0900 Committer: Paulo Motta <pa...@apache.org> Committed: Tue Apr 4 11:07:33 2017 -0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/633babf0/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 4f9d273..bfae0bf 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -241,7 +241,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber private boolean isKeepAliveSupported() { CassandraVersion peerVersion = Gossiper.instance.getReleaseVersion(peer); - return peerVersion.compareTo(STREAM_KEEP_ALIVE_VERSION) >= 0; + return peerVersion != null && peerVersion.compareTo(STREAM_KEEP_ALIVE_VERSION) >= 0; } /**
