accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/3] git commit: ACCUMULO-3128 Screwed up the conditional
Date Mon, 15 Sep 2014 22:52:27 GMT
ACCUMULO-3128 Screwed up the conditional


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

Branch: refs/heads/master
Commit: e455005f6e9a33f82eb25d6b89816704ad8663de
Parents: 4556ec4
Author: Josh Elser <elserj@apache.org>
Authored: Mon Sep 15 18:49:16 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Sep 15 18:49:16 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/SslConnectionParams.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e455005f/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
index 640f66e..d3b1ae9 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
@@ -79,8 +79,9 @@ public class SslConnectionParams  {
 
   private static String passwordFromConf(AccumuloConfiguration conf, String defaultPassword,
Property passwordOverrideProperty) {
     String keystorePassword = conf.get(passwordOverrideProperty);
-    if (log.isTraceEnabled() && !keystorePassword.isEmpty()) {
-      log.trace("Using explicit SSL private key password from " + passwordOverrideProperty.getKey());
+    if (!keystorePassword.isEmpty()) {
+      if (log.isTraceEnabled())
+        log.trace("Using explicit SSL private key password from " + passwordOverrideProperty.getKey());
     } else {
       keystorePassword = defaultPassword;
     }


Mime
View raw message