aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-06-11 19:22:53 -0400
committerJeff Johnston2018-06-11 20:47:59 -0400
commit4fd02d33ce82c80eb23bc45595159a40c2777a4a (patch)
tree9a8b6b8e98c8eb261c2bcc15ab0488649a36ea5e
parent659c57b57b925421d8b5d86a296588fc79412f12 (diff)
downloadorg.eclipse.linuxtools-4fd02d33ce82c80eb23bc45595159a40c2777a4a.tar.gz
org.eclipse.linuxtools-4fd02d33ce82c80eb23bc45595159a40c2777a4a.tar.xz
org.eclipse.linuxtools-4fd02d33ce82c80eb23bc45595159a40c2777a4a.zip
Bug 535781 - [EPP Photon RC3] java.lang.NoClassDefFoundError
- add check for IllegalArgumentException to DockerConnection ping() method in case 127.0.0.1 is not set up with a host name Change-Id: I7f33b193942132f987790b070d98aa0a97d5b302 Reviewed-on: https://git.eclipse.org/r/124371 Tested-by: CI Bot Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit b2366f4a815b1e48ec9f0927be6f922faf6dae73) Reviewed-on: https://git.eclipse.org/r/124372
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 6a02351a9d..583f54170f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -379,7 +379,7 @@ public class DockerConnection
}
setState(EnumDockerConnectionState.ESTABLISHED);
} catch (com.spotify.docker.client.exceptions.DockerException
- | InterruptedException e) {
+ | InterruptedException | IllegalArgumentException e) {
setState(EnumDockerConnectionState.CLOSED);
throw new DockerPingConnectionException(NLS.bind(
Messages.Docker_Daemon_Ping_Failure, this.getName()), e);