Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2015-06-08 22:35:56 -0400
committerJeff Johnston2015-06-08 23:45:17 -0400
commitea2015978002aa0a6f049486910a929d96f499f6 (patch)
treea10749ae3e744dbf69dc6be72dbac53f491c0fab
parentb534469af055df12b73b445aec034e6288287738 (diff)
downloadorg.eclipse.linuxtools-ea2015978002aa0a6f049486910a929d96f499f6.tar.gz
org.eclipse.linuxtools-ea2015978002aa0a6f049486910a929d96f499f6.tar.xz
org.eclipse.linuxtools-ea2015978002aa0a6f049486910a929d96f499f6.zip
Bug 469670 - Removing Container in Mars RC3 does not remove console
- fix RemoveContainersCommandHandler to add removal of the console Change-Id: I8ea05d69c27410434cb485a361419fd904dc6cbe Reviewed-on: https://git.eclipse.org/r/49724 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit a8a35109a60fcd169f96d7431f819a8a65e7b05b) Reviewed-on: https://git.eclipse.org/r/49726
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainersCommandHandler.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainersCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainersCommandHandler.java
index 5f5aa1326b..6a55237d18 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainersCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainersCommandHandler.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.linuxtools.docker.core.DockerException;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerContainer;
+import org.eclipse.linuxtools.internal.docker.ui.RunConsole;
import org.eclipse.linuxtools.internal.docker.ui.views.DVMessages;
import org.eclipse.swt.widgets.Display;
@@ -40,6 +41,9 @@ public class RemoveContainersCommandHandler extends BaseContainersCommandHandler
final IDockerConnection connection) {
try {
connection.removeContainer(container.id());
+ RunConsole rc = RunConsole.findConsole(container.id());
+ if (rc != null)
+ RunConsole.removeConsole(rc);
} catch (DockerException | InterruptedException e) {
final String errorMessage = DVMessages.getFormattedString(
CONTAINER_REMOVE_ERROR_MSG, container.name());

Back to the top