From 5274858e74f2ba4151fc64ffe5ea9db1fb425805 Mon Sep 17 00:00:00 2001 From: Alexander Garagatyi Date: Tue, 1 Mar 2016 12:05:46 +0200 Subject: [PATCH] fix NPE because of incorrect usage of firstNonNull Signed-off-by: Alexander Garagatyi --- .../machine/local/LocalDockerInstanceRuntimeInfo.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalDockerInstanceRuntimeInfo.java b/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalDockerInstanceRuntimeInfo.java index f8b71d9e51..1545fefb15 100644 --- a/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalDockerInstanceRuntimeInfo.java +++ b/plugins/plugin-docker/che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalDockerInstanceRuntimeInfo.java @@ -19,8 +19,6 @@ import org.eclipse.che.plugin.docker.machine.DockerInstanceRuntimeInfo; import javax.inject.Inject; import javax.inject.Named; -import static com.google.common.base.MoreObjects.firstNonNull; - /** * Gets predefined docker containers host for machine servers instead of evaluating it from docker configuration * @@ -41,8 +39,7 @@ public class LocalDockerInstanceRuntimeInfo extends DockerInstanceRuntimeInfo { public LocalDockerInstanceRuntimeInfo(@Assisted ContainerInfo containerInfo, @Assisted String containerHost, @Nullable @Named("machine.docker.local_node_host") String dockerNodeHost) { - super(containerInfo, firstNonNull(firstNonNull(dockerNodeHost, - System.getenv(CHE_DOCKER_MACHINE_HOST)), - containerHost)); + super(containerInfo, dockerNodeHost != null ? dockerNodeHost : + (System.getenv(CHE_DOCKER_MACHINE_HOST) != null ? System.getenv(CHE_DOCKER_MACHINE_HOST) : containerHost)); } }