From 4a973ecddc0979da814562b283ab79d373109a4b Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 29 Mar 2011 22:39:36 +0000 Subject: [PATCH] Correct fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=50928 Default for keyPass is keystorePass git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1086794 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/AbstractEndpoint.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java index c35798dea..b31f3f38c 100644 --- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java @@ -30,7 +30,6 @@ import javax.net.ssl.KeyManagerFactory; import org.apache.juli.logging.Log; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.tomcat.util.net.jsse.JSSESocketFactory; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.threads.CounterLatch; import org.apache.tomcat.util.threads.ResizableExecutor; @@ -672,7 +671,7 @@ public abstract class AbstractEndpoint { public String getKeyAlias() { return keyAlias;} public void setKeyAlias(String s ) { keyAlias = s;} - private String keyPass = JSSESocketFactory.DEFAULT_KEY_PASS; + private String keyPass = null; public String getKeyPass() { return keyPass;} public void setKeyPass(String s ) { this.keyPass = s;} -- 2.11.0