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 6A3F49DC9 for ; Thu, 23 May 2013 16:25:03 +0000 (UTC) Received: (qmail 601 invoked by uid 500); 23 May 2013 16:25:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 544 invoked by uid 500); 23 May 2013 16:25:02 -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 433 invoked by uid 99); 23 May 2013 16:25:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 16:25:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06615894999; Thu, 23 May 2013 16:25:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 23 May 2013 16:25:03 -0000 Message-Id: <89d0056f69ba4521bbeec0b3124e1676@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/5] git commit: fix NPE fix NPE Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e6888e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e6888e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e6888e Branch: refs/heads/trunk Commit: 57e6888e6aa8cc726fadb4087fe0cb77853c12eb Parents: 2d0dff7 Author: Jonathan Ellis Authored: Thu May 23 11:24:35 2013 -0500 Committer: Jonathan Ellis Committed: Thu May 23 11:24:46 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogReplayer.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57e6888e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java index e1fefa1..6b401fb 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java @@ -80,7 +80,8 @@ public class CommitLogReplayer ReplayPosition rp = ReplayPosition.getReplayPosition(cfs.getSSTables()); // but, if we've truncted the cf in question, then we need to need to start replay after the truncation - ReplayPosition truncatedAt = truncationPositions.get(cfs.metadata.cfId).left; + Pair truncateRecord = truncationPositions.get(cfs.metadata.cfId); + ReplayPosition truncatedAt = truncateRecord == null ? null : truncateRecord.left; if (truncatedAt != null) rp = replayPositionOrdering.max(Arrays.asList(rp, truncatedAt));