You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by zz...@apache.org on 2016/09/20 02:32:37 UTC
[31/50] [abbrv] cassandra git commit: Fix NPE in SSTableLoader when
specifying partial directory path
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/cassandra-3.9
Commit: 893fd21b52254b1f7d68d87f6cf5f77f3010734b
Parents: fa14804
Author: Hannu Kr�ger <hk...@gmail.com>
Authored: Sun Sep 4 10:36:37 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
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,