From b2b04cb5d74748bc2332fa500b86437700c52313 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 18 Jan 2008 20:57:51 +0000 Subject: [PATCH] Fix bug 44223. Use all the trust store system properties. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@613266 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java index a7945b1a9..16cece72c 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java @@ -283,6 +283,9 @@ public class JSSESocketFactory 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; } -- 2.11.0