Author: markt
Date: Fri Jan 18 12:57:51 2008
New Revision: 613266
URL: http://svn.apache.org/viewvc?rev=613266&view=rev
Log:
Fix bug 44223. Use all the trust store system properties.
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=613266&r1=613265&r2=613266&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
Fri Jan 18 12:57:51 2008
@@ -283,6 +283,9 @@
log.debug("TrustPass = " + trustStorePassword);
}
String truststoreType = (String)attributes.get("truststoreType");
+ if( truststoreType == null) {
+ truststoreType =
System.getProperty("javax.net.ssl.trustStoreType");
+ }
if(truststoreType == null) {
truststoreType = keystoreType;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
