svn commit: r1086794 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

[markt]

Author: markt
Date: Tue Mar 29 22:39:36 2011
New Revision: 1086794

URL: http://svn.apache.org/viewvc?rev=1086794&view=rev
Log:
Correct fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=50928
Default for keyPass is keystorePass

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1086794&r1=1086793&r2=1086794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Mar 
29 22:39:36 2011
@@ -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;}
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org