diff options
| author | Xavier Coulon | 2016-08-17 09:09:23 +0000 |
|---|---|---|
| committer | Xavier Coulon | 2016-08-17 09:53:25 +0000 |
| commit | 98bba6e8b12825d8cb288f2ac1fe6e01df591b78 (patch) | |
| tree | 554251cfc5addb95e8f27ec697bfdab63f12f407 | |
| parent | 5f9fbca83ff90c2d83824c794694314207bdedf8 (diff) | |
| download | org.eclipse.linuxtools-98bba6e8b12825d8cb288f2ac1fe6e01df591b78.tar.gz org.eclipse.linuxtools-98bba6e8b12825d8cb288f2ac1fe6e01df591b78.tar.xz org.eclipse.linuxtools-98bba6e8b12825d8cb288f2ac1fe6e01df591b78.zip | |
Bug 499745 - Docker Explorer broken on Windows
Prevent IOOBE when there was no connection settings available.
Change-Id: Ib9567222b2801fa6d7e0084ecbc26b0b2cfe0f2d
Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
Reviewed-on: https://git.eclipse.org/r/79186
Tested-by: Hudson CI
| -rw-r--r-- | containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java index 4412b56057..8db0b10a6f 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java +++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java @@ -149,9 +149,9 @@ public class DefaultDockerConnectionSettingsFinder * is readable and writable, {@code null} otherwise. */ public IDockerConnectionSettings defaultsWithUnixSocket() { - List<IDockerConnectionSettings> res = new DefaultUnixConnectionSettingsProvider() + final List<IDockerConnectionSettings> res = new DefaultUnixConnectionSettingsProvider() .getConnectionSettings(); - if (res != null) { + if (res != null && !res.isEmpty()) { return res.get(0); } return null; @@ -165,9 +165,9 @@ public class DefaultDockerConnectionSettingsFinder * environment variables exist, {@code null} otherwise. */ public IDockerConnectionSettings defaultsWithSystemEnv() { - List<IDockerConnectionSettings> res = new SystemConnectionSettingsProvider() + final List<IDockerConnectionSettings> res = new SystemConnectionSettingsProvider() .getConnectionSettings(); - if (res != null) { + if (res != null && !res.isEmpty()) { return res.get(0); } return null; @@ -181,9 +181,9 @@ public class DefaultDockerConnectionSettingsFinder * environment variables exist, {@code null} otherwise. */ public IDockerConnectionSettings defaultsWithShellEnv() { - List<IDockerConnectionSettings> res = new ShellConnectionSettingsProvider() + final List<IDockerConnectionSettings> res = new ShellConnectionSettingsProvider() .getConnectionSettings(); - if (res != null) { + if (res != null && !res.isEmpty()) { return res.get(0); } return null; |