From 7b82a77a89203a1ba82034f4c0fe0ac497fd59e3 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 1 Jun 2016 13:03:35 -0400 Subject: 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 --- .../org/eclipse/linuxtools/internal/docker/core/DockerConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 containers; // containers indexed by id - private Map containersById; + private Map 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); -- cgit v1.2.3