From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Jun 2011 16:53:58 +0000 (+0000)
Subject: No functional change.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1b2b1beae97149a6ea68a7500bedf3289ea4f856;p=tomcat7.0

No functional change.
Refactoring so all attributes are handled the same way.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1138550 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index f9a5585a3..fb36edcda 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -283,13 +283,12 @@ public class JSSESocketFactory implements ServerSocketFactory, SSLUtil {
      * Gets the SSL server's keystore password.
      */
     protected String getKeystorePassword() {
-        String keyPass = endpoint.getKeyPass();
-        if (keyPass == null) {
-            keyPass = DEFAULT_KEY_PASS;
-        }
         String keystorePass = endpoint.getKeystorePass();
         if (keystorePass == null) {
-            keystorePass = keyPass;
+            keystorePass = endpoint.getKeyPass();
+        }
+        if (keystorePass == null) {
+            keystorePass = DEFAULT_KEY_PASS;
         }
         return keystorePass;
     }