Merge pull request apache#4448 from hansva/main

fix truststore issue in rest
hansva · Oct 18, 2024 · db80159 · db80159
2 parents 0c2454f + 5051b75
commit db80159
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/Rest.java b/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/Rest.java
@@ -113,13 +113,9 @@ protected Object[] callRest(Object[] rowData) throws HopException {
           .withConfig(data.config)
           .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
 
-      if (!Utils.isEmpty(data.trustStoreFile)) {
-        clientBuilder.sslContext(data.sslContext);
-      }
-
-      // Ignore SSL is selected disable hostname verifier
-      if (meta.isIgnoreSsl()) {
+      if (meta.isIgnoreSsl() || !Utils.isEmpty(data.trustStoreFile)) {
         clientBuilder.hostnameVerifier((s1, s2) -> true);
+        clientBuilder.sslContext(data.sslContext);
       }
 
       client = clientBuilder.build();