Fix docker null host

jenkinsci · Sep 23, 2019 · 2431883 · 2431883
1 parent a7a06d8
commit 2431883
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/docker/utils/DockerUtils.java b/src/main/java/org/jfrog/hudson/pipeline/common/docker/utils/DockerUtils.java
@@ -334,7 +334,9 @@ public static DockerClient getDockerClient(String host, EnvVars envVars) {
       if (envVars.containsKey(DefaultDockerClientConfig.DOCKER_HOST)) {
           configBuilder.withDockerHost(envVars.get(DefaultDockerClientConfig.DOCKER_HOST));
       } else {
-          if (!StringUtils.isEmpty(host)) {
+          // If open JDK is used and the host is null
+          // then instead of a null reference, the host is the string "null".
+          if (!StringUtils.isEmpty(host) && !host.equalsIgnoreCase("null")) {
               configBuilder.withDockerHost(host);
           }
       }