Repository: cassandra Updated Branches: refs/heads/trunk 8ed41fbc5 -> fb0e0019e
Set encryptionOptions to null if encryption is disabled in BulkLoadConnectionFactory Patch by marcuse; reviewed by Jason Brown for CASSANDRA-13836 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb0e0019 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb0e0019 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb0e0019 Branch: refs/heads/trunk Commit: fb0e0019e76eb96659904b9161f06b600718e704 Parents: 8ed41fb Author: Marcus Eriksson <[email protected]> Authored: Fri Sep 1 15:03:05 2017 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Sep 1 15:55:06 2017 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/tools/BulkLoadConnectionFactory.java | 4 +++- src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb0e0019/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java b/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java index d119081..b56d292 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java +++ b/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java @@ -38,7 +38,9 @@ public class BulkLoadConnectionFactory extends DefaultConnectionFactory implemen { this.storagePort = storagePort; this.secureStoragePort = secureStoragePort; - this.encryptionOptions = encryptionOptions; + this.encryptionOptions = encryptionOptions != null && encryptionOptions.internode_encryption == EncryptionOptions.ServerEncryptionOptions.InternodeEncryption.none + ? null + : encryptionOptions; this.outboundBindAny = outboundBindAny; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb0e0019/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 0f1c555..01d8c33 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -104,7 +104,7 @@ public class BulkLoader // Give sockets time to gracefully close Thread.sleep(1000); - // System.exit(0); // We need that to stop non daemonized threads + System.exit(0); // We need that to stop non daemonized threads } catch (Exception e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
