From a76636465022f646ac4f7b8f3827666918b2c1bf Mon Sep 17 00:00:00 2001 From: Kodanda Ramu Kakarla Date: Tue, 2 May 2017 13:26:10 +0530 Subject: [PATCH] Corrected keystore related messages to truststore messages for truststore location/password checks --- .../main/org/apache/zookeeper/common/X509Util.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/main/org/apache/zookeeper/common/X509Util.java b/src/java/main/org/apache/zookeeper/common/X509Util.java index c48d6941a06..a77361445cc 100644 --- a/src/java/main/org/apache/zookeeper/common/X509Util.java +++ b/src/java/main/org/apache/zookeeper/common/X509Util.java @@ -115,19 +115,19 @@ public static SSLContext createSSLContext(ZKConfig config) throws SSLContextExce String trustStorePasswordProp = config.getProperty(ZKConfig.SSL_TRUSTSTORE_PASSWD); if (trustStoreLocationProp == null && trustStorePasswordProp == null) { - LOG.warn("keystore not specified for client connection"); + LOG.warn("Truststore not specified for client connection"); } else { if (trustStoreLocationProp == null) { - throw new SSLContextException("keystore location not specified for client connection"); + throw new SSLContextException("Truststore location not specified for client connection"); } if (trustStorePasswordProp == null) { - throw new SSLContextException("keystore password not specified for client connection"); + throw new SSLContextException("Truststore password not specified for client connection"); } try { trustManagers = new TrustManager[]{ createTrustManager(trustStoreLocationProp, trustStorePasswordProp)}; } catch (TrustManagerException e) { - throw new SSLContextException("Failed to create KeyManager", e); + throw new SSLContextException("Failed to create TrustManager", e); } } @@ -199,4 +199,4 @@ public static X509TrustManager createTrustManager(String trustStoreLocation, Str } } } -} \ No newline at end of file +}