Author: markt
Date: Wed Jun 22 16:53:58 2011
New Revision: 1138550
URL: http://svn.apache.org/viewvc?rev=1138550&view=rev
Log:
No functional change.
Refactoring so all attributes are handled the same way.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1138550&r1=1138549&r2=1138550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Wed Jun 22 16:53:58 2011
@@ -283,13 +283,12 @@ public class JSSESocketFactory implement
* 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
