From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 29 Mar 2011 22:39:36 +0000 (+0000)
Subject: Correct fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=50928
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4a973ecddc0979da814562b283ab79d373109a4b;p=tomcat7.0

Correct fix for 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
---

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;}