|
|
|
|
@ -173,8 +173,16 @@ private void setTrustStore()
|
|
|
|
|
String tsType = (String)config.getProperty(PNAME_TRUSTSTORE_TYPE);
|
|
|
|
|
String tsFile = (String)config.getProperty(PNAME_TRUSTSTORE_FILE);
|
|
|
|
|
String tsPassword = credService.loadPassword(PNAME_TRUSTSTORE_PASSWORD);
|
|
|
|
|
|
|
|
|
|
// use the OS store as default store on Windows
|
|
|
|
|
if (tsType == null
|
|
|
|
|
&& !"meta:default".equals(tsType)
|
|
|
|
|
&& OSUtils.IS_WINDOWS)
|
|
|
|
|
{
|
|
|
|
|
config.setProperty(PNAME_TRUSTSTORE_TYPE, "Windows-ROOT");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(tsType != null)
|
|
|
|
|
if(tsType != null && !"meta:default".equals(tsType))
|
|
|
|
|
System.setProperty("javax.net.ssl.trustStoreType", tsType);
|
|
|
|
|
else
|
|
|
|
|
System.getProperties().remove("javax.net.ssl.trustStoreType");
|
|
|
|
|
|