zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2767: Corrected keystore related messages to truststore mess…
Date Fri, 26 May 2017 23:03:52 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/master b0b194533 -> 5bfcc13fd


ZOOKEEPER-2767: Corrected keystore related messages to truststore mess…

possible fix for "https://issues.apache.org/jira/browse/ZOOKEEPER-2767"

Author: Ramu <kkakarla@redhat.com>

Reviewers: Michael Han <hanm@apache.org>

Closes #263 from ramu11/ZOOKEEPER-2767


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/5bfcc13f
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/5bfcc13f
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/5bfcc13f

Branch: refs/heads/master
Commit: 5bfcc13fd6820c212d67c39fede4dc4a50d84d83
Parents: b0b1945
Author: Ramu <kkakarla@redhat.com>
Authored: Fri May 26 16:03:46 2017 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Fri May 26 16:03:46 2017 -0700

----------------------------------------------------------------------
 src/java/main/org/apache/zookeeper/common/X509Util.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/5bfcc13f/src/java/main/org/apache/zookeeper/common/X509Util.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/common/X509Util.java b/src/java/main/org/apache/zookeeper/common/X509Util.java
index c48d694..cc8662e 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 class X509Util {
         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);
             }
         }
 


Mime
View raw message