Repository: cassandra Updated Branches: refs/heads/trunk 693e52d66 -> fe5ef557c
if there's no truststore, no need to fetch other ssl attributes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe5ef557 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe5ef557 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe5ef557 Branch: refs/heads/trunk Commit: fe5ef557c076c9730e6d71efafc711c43194905c Parents: 693e52d Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Jun 15 20:19:47 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Jun 15 20:19:47 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe5ef557/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java index 757be65..f76f7d9 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java @@ -529,13 +529,14 @@ public class CqlConfigHelper public static Optional<SSLOptions> getSSLOptions(Configuration conf) { Optional<String> truststorePath = getInputNativeSSLTruststorePath(conf); - Optional<String> keystorePath = getInputNativeSSLKeystorePath(conf); - Optional<String> truststorePassword = getInputNativeSSLTruststorePassword(conf); - Optional<String> keystorePassword = getInputNativeSSLKeystorePassword(conf); - Optional<String> cipherSuites = getInputNativeSSLCipherSuites(conf); if (truststorePath.isPresent()) { + Optional<String> keystorePath = getInputNativeSSLKeystorePath(conf); + Optional<String> truststorePassword = getInputNativeSSLTruststorePassword(conf); + Optional<String> keystorePassword = getInputNativeSSLKeystorePassword(conf); + Optional<String> cipherSuites = getInputNativeSSLCipherSuites(conf); + SSLContext context; try {
