On 08/19/2014 04:25 PM, jfcl...@apache.org wrote:
Author: jfclere
Date: Tue Aug 19 14:25:04 2014
New Revision: 1618872
URL: http://svn.apache.org/r1618872
Log:
Rollback r1618650.
I will come back later with a better commit message and some docs.
Cheers
Jean-Frederic
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=1618872&r1=1618871&r2=1618872&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
Tue Aug 19 14:25:04 2014
@@ -295,8 +295,6 @@ public class JSSESocketFactory implement
String keystoreFile = endpoint.getKeystoreFile();
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
- if("Windows-MY".equals(type))
- keystoreFile = "";
return getStore(type, provider, keystoreFile, pass);
}
@@ -312,8 +310,6 @@ public class JSSESocketFactory implement
if(truststoreFile == null) {
truststoreFile = System.getProperty("javax.net.ssl.trustStore");
}
- if("Windows-ROOT".equals(keystoreType))
- truststoreFile = "";
if(log.isDebugEnabled()) {
log.debug("Truststore = " + truststoreFile);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
