Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582b66fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582b66fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/582b66fb Branch: refs/heads/cassandra-3.1 Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13 Parents: ecd66de Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Nov 13 09:13:14 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:13:14 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index e9ebb6f..2f69d66 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -887,7 +887,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean states.put(key, value); } } - reqdEndpointState.addApplicationStates(states); + if (reqdEndpointState != null) + reqdEndpointState.addApplicationStates(states); } return reqdEndpointState; }
