Load default Java truststore for --use-system-truststore

trinodb · Oct 11, 2023 · 25f89e7 · 25f89e7
1 parent 8c67edf
commit 25f89e7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java b/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
@@ -303,8 +303,16 @@ else if (osName.contains("Mac")) {
             }
         }
 
-        KeyStore trustStore = KeyStore.getInstance(systemTrustStoreType.orElseGet(KeyStore::getDefaultType));
-        trustStore.load(null, null);
+        KeyStore trustStore;
+        if (systemTrustStoreType.isPresent()) {
+            trustStore = KeyStore.getInstance(systemTrustStoreType.orElseGet(KeyStore::getDefaultType));
+            trustStore.load(null, null);
+        }
+        else {
+            // return null if trustStoreType isn't specified and osName is unknown
+            // trustManagerFactory.init(null) will try to load the default Java trustStore
+            trustStore = null;
+        }
         return trustStore;
     }