Author: jim Date: Mon Jan 28 06:41:11 2008 New Revision: 615897 URL: http://svn.apache.org/viewvc?rev=615897&view=rev Log: Merge r613266 from trunk:
Fix bug 44223. Use all the trust store system properties. Submitted by: markt Reviewed by: jim Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615897&r1=615896&r2=615897&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 28 06:41:11 2008 @@ -38,13 +38,6 @@ -1: remm: I believe it would need specific support for certain managers. Interested users could use their own extended manager instead. -* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44223 - Add support for remaining truststore system property - Not essential for 6.0.16. - http://svn.apache.org/viewvc?rev=613266&view=rev - +1: markt, pero, remm, jim - -1: - * Update JNDI docs to use server.xml less and <Context> more http://svn.apache.org/viewvc?rev=613689&view=rev Not essential for 6.0.16. Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=615897&r1=615896&r2=615897&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Mon Jan 28 06:41:11 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]