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 AB2181098C for ; Fri, 30 May 2014 20:52:12 +0000 (UTC) Received: (qmail 95416 invoked by uid 500); 30 May 2014 20:52:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95375 invoked by uid 500); 30 May 2014 20:52:12 -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 95364 invoked by uid 99); 30 May 2014 20:52:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 May 2014 20:52:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3E48D881388; Fri, 30 May 2014 20:52:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 30 May 2014 20:52:12 -0000 Message-Id: <11b729ee784141cba53ca463d6dbf3bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Fix NPE in StreamTransferTask.createMessageForRetry() Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9141f7ba7 -> 90477c310 Fix NPE in StreamTransferTask.createMessageForRetry() patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/886d9fce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/886d9fce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/886d9fce Branch: refs/heads/cassandra-2.1 Commit: 886d9fce46b369807071c5fc87204bb552db906d Parents: 8480fa7 Author: Josh McKenzie Authored: Fri May 30 23:49:09 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri May 30 23:49:09 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/886d9fce/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 14b43e5..d1d1030 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.9 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) * Add conditional CREATE/DROP USER support (CASSANDRA-7264) * Swap local and global default read repair chances (CASSANDRA-7320) * Add missing iso8601 patterns for date strings (CASSANDRA-6973) http://git-wip-us.apache.org/repos/asf/cassandra/blob/886d9fce/src/java/org/apache/cassandra/streaming/StreamTransferTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java index 7d0cc87..a543d01 100644 --- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java @@ -99,11 +99,12 @@ public class StreamTransferTask extends StreamTask return new ArrayList<>(files.values()); } - public OutgoingFileMessage createMessageForRetry(int sequenceNumber) + public synchronized OutgoingFileMessage createMessageForRetry(int sequenceNumber) { // remove previous time out task to be rescheduled later ScheduledFuture future = timeoutTasks.get(sequenceNumber); - future.cancel(false); + if (future != null) + future.cancel(false); return files.get(sequenceNumber); }