Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D117D200B75 for ; Sun, 4 Sep 2016 16:40:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CFE31160AC0; Sun, 4 Sep 2016 14:40:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2A848160AAB for ; Sun, 4 Sep 2016 16:40:28 +0200 (CEST) Received: (qmail 22378 invoked by uid 500); 4 Sep 2016 14:40:27 -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 22357 invoked by uid 99); 4 Sep 2016 14:40:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Sep 2016 14:40:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 116D7E0579; Sun, 4 Sep 2016 14:40:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sun, 04 Sep 2016 14:40:27 -0000 Message-Id: <655ee83eb6cd4f46b2abf26118ea8b5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Fix NPE in SSTableLoader when specifying partial directory path archived-at: Sun, 04 Sep 2016 14:40:29 -0000 Repository: cassandra Updated Branches: refs/heads/trunk ca7256d76 -> 7d593b760 Fix NPE in SSTableLoader when specifying partial directory path patch by hkroger reviewed by dbrosius for CASSANDRA-12609 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/893fd21b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/893fd21b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/893fd21b Branch: refs/heads/trunk Commit: 893fd21b52254b1f7d68d87f6cf5f77f3010734b Parents: fa14804 Author: Hannu Kröger Authored: Sun Sep 4 10:36:37 2016 -0400 Committer: Dave Brosius Committed: Sun Sep 4 10:36:37 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/893fd21b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 21fc42c..798496a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -48,6 +48,7 @@ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Fix EOF exception when altering column type (CASSANDRA-11820) * Fix JsonTransformer output of partition with deletion info (CASSANDRA-12418) + * Fix NPE in SSTableLoader when specifying partial directory path (CASSANDRA-12609) Merged from 2.2: * Add local address entry in PropertyFileSnitch (CASSANDRA-11332) * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) http://git-wip-us.apache.org/repos/asf/cassandra/blob/893fd21b/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 2b2db15..9dba1b2 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -77,7 +77,7 @@ public class BulkLoader LoaderOptions options = LoaderOptions.parseArgs(args).validateArguments(); OutputHandler handler = new OutputHandler.SystemOutput(options.verbose, options.debug); SSTableLoader loader = new SSTableLoader( - options.directory, + options.directory.getAbsoluteFile(), new ExternalClient( options.hosts, options.nativePort,