Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2015-06-08 18:40:57 -0400
committerJeff Johnston2015-06-08 21:09:00 -0400
commitfa6698377c7b9e8eeea4ba0fd4e7d57c423ce1e9 (patch)
tree0a25d2015acfe30dc649f4c1392815b5f62f69b1
parentc716b1ce515aed9acb5522f4cff49ca4cdf0082b (diff)
downloadorg.eclipse.linuxtools-fa6698377c7b9e8eeea4ba0fd4e7d57c423ce1e9.tar.gz
org.eclipse.linuxtools-fa6698377c7b9e8eeea4ba0fd4e7d57c423ce1e9.tar.xz
org.eclipse.linuxtools-fa6698377c7b9e8eeea4ba0fd4e7d57c423ce1e9.zip
Fix more console regressions from Run Image
- fix findConsole() call in DisplayContainerLogCommand to not specify a secondary id - fix findConsole(IDockerContainer) in RunConsole to use the name from the Container in naming the console Change-Id: Icd606913d2b05ad1bf480473b6a9a3d570a573ea Reviewed-on: https://git.eclipse.org/r/49709 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit f93d7f1ff32f2ef8247dbdeeec557f02e95c7b45) Reviewed-on: https://git.eclipse.org/r/49711
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/RunConsole.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/DisplayContainerLogCommandHandler.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/RunConsole.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/RunConsole.java
index 36f9b88c3f..37a76cac2c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/RunConsole.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/RunConsole.java
@@ -81,7 +81,7 @@ public class RunConsole extends IOConsole {
public static RunConsole findConsole(IDockerContainer container) {
if (container == null)
return null;
- return findConsole(container.id(), DEFAULT_ID);
+ return findConsole(container.id(), DEFAULT_ID, container.name());
}
/**
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/DisplayContainerLogCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/DisplayContainerLogCommandHandler.java
index 2aad131b6c..4cc20d440d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/DisplayContainerLogCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/DisplayContainerLogCommandHandler.java
@@ -50,7 +50,7 @@ public class DisplayContainerLogCommandHandler extends AbstractHandler {
final String id = container.id();
final String name = container.name();
try {
- final RunConsole rc = RunConsole.findConsole(id, name);
+ final RunConsole rc = RunConsole.findConsole(id);
if (!rc.isAttached()) {
rc.attachToConsole(connection);
}

Back to the top