Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D6AD11BD1 for ; Wed, 17 Sep 2014 21:07:49 +0000 (UTC) Received: (qmail 95050 invoked by uid 500); 17 Sep 2014 21:07:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95007 invoked by uid 500); 17 Sep 2014 21:07:49 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 94960 invoked by uid 99); 17 Sep 2014 21:07:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 21:07:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E18D2A1981E; Wed, 17 Sep 2014 21:07:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Wed, 17 Sep 2014 21:07:48 -0000 Message-Id: <3627b3b524064bd8b67ce8fa3370f34b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: Prevent NPE on FD conviction race Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 f19b4cb80 -> 05920cb38 refs/heads/cassandra-2.1 7c34d8bb7 -> 83d15631f refs/heads/trunk 134c2e969 -> 47cda388f Prevent NPE on FD conviction race Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05920cb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05920cb3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05920cb3 Branch: refs/heads/cassandra-2.0 Commit: 05920cb38bc8559704450965ce4bb326a917c86a Parents: f19b4cb Author: Brandon Williams Authored: Wed Sep 17 14:06:10 2014 +0000 Committer: Brandon Williams Committed: Wed Sep 17 14:06:10 2014 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05920cb3/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 01299ea..4514da7 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -298,6 +298,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean public void convict(InetAddress endpoint, double phi) { EndpointState epState = endpointStateMap.get(endpoint); + if (epState == null) + return; if (epState.isAlive() && !isDeadState(epState)) { markDead(endpoint, epState);