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

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index a7945b1..16cece7 100644 (file)
--- 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;
         }