diff options
| author | Jeff Johnston | 2016-06-01 17:03:35 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2016-06-01 17:48:39 +0000 |
| commit | 7b82a77a89203a1ba82034f4c0fe0ac497fd59e3 (patch) | |
| tree | 3e7f994a89c59e1210cf8a0346880fb33500a4f0 | |
| parent | 314ad268c05adc1347b171124232959ef06dad0c (diff) | |
| download | org.eclipse.linuxtools-7b82a77a89203a1ba82034f4c0fe0ac497fd59e3.tar.gz org.eclipse.linuxtools-7b82a77a89203a1ba82034f4c0fe0ac497fd59e3.tar.xz org.eclipse.linuxtools-7b82a77a89203a1ba82034f4c0fe0ac497fd59e3.zip | |
Bug 495198 - NPE after enabling disabled connection
- initialize containersById to empty collection
Change-Id: I33aa9836f586ec91f14bce3f733ba883aabcb4d4
Reviewed-on: https://git.eclipse.org/r/74270
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
| -rw-r--r-- | containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java | 3 |
1 files changed, 2 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 5dbc61141e..b5a00a4893 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 @@ -174,7 +174,7 @@ public class DockerConnection implements IDockerConnection, Closeable { // containers sorted by name private List<IDockerContainer> containers; // containers indexed by id - private Map<String, IDockerContainer> containersById; + private Map<String, IDockerContainer> containersById = new HashMap<>(); // flag to indicate if the state of the connection to the Docker daemon private EnumDockerConnectionState state = EnumDockerConnectionState.UNKNOWN; private boolean containersLoaded = false; @@ -297,6 +297,7 @@ public class DockerConnection implements IDockerConnection, Closeable { case CLOSED: this.images = Collections.emptyList(); this.containers = Collections.emptyList(); + this.containersById = new HashMap<>(); this.imagesLoaded = true; this.containersLoaded = true; notifyContainerListeners(this.containers); |