Repository: cassandra Updated Branches: refs/heads/trunk 0171cd6ff -> e228703b8
don't NPE shutting down, due to gossip failure Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea5b6246 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea5b6246 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea5b6246 Branch: refs/heads/trunk Commit: ea5b6246d24c6092cda17c28610f76b17b0be25c Parents: 6faf80c Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon May 26 16:39:10 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon May 26 16:39:10 2014 -0400 ---------------------------------------------------------------------- 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/ea5b6246/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 f014ac0..c04a87d 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -1267,7 +1267,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean public void stop() { - scheduledGossipTask.cancel(false); + if (scheduledGossipTask != null) + scheduledGossipTask.cancel(false); logger.info("Announcing shutdown"); Uninterruptibles.sleepUninterruptibly(intervalInMillis * 2, TimeUnit.MILLISECONDS); MessageOut message = new MessageOut(MessagingService.Verb.GOSSIP_SHUTDOWN);
