Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-01-22 19:58:40 +0000
committerJeff Johnston2018-01-22 19:58:40 +0000
commit64154f20f263899775b90f2d2db0407ad55bbb02 (patch)
treec304c286bb886cf122370217e4fdc9f2c437f352 /launch/org.eclipse.cdt.docker.launcher
parent573af6187b2f89d4d2b6a843ad93e366736503ef (diff)
downloadorg.eclipse.cdt-64154f20f263899775b90f2d2db0407ad55bbb02.tar.gz
org.eclipse.cdt-64154f20f263899775b90f2d2db0407ad55bbb02.tar.xz
org.eclipse.cdt-64154f20f263899775b90f2d2db0407ad55bbb02.zip
Bug 530053 - Launching locally after Container launch doesn't work
- fix other way round, launching locally, then in Container - add null check for connectionURI in Docker LaunchShort when searching launch configs in case there is a local configuration in the list Change-Id: I08f89a9d1dccff3ace54667e86e9d3e8840f8694
Diffstat (limited to 'launch/org.eclipse.cdt.docker.launcher')
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java
index 21eb1de019a..64cd3a289d8 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java
@@ -299,7 +299,8 @@ public class LaunchShortcut implements ILaunchShortcut {
// if we have an active configuration with container
// build properties, make sure they match, otherwise
// add the launch config as a candidate
- if (connectionUri.equals(config.getAttribute(
+ if (connectionUri != null
+ && connectionUri.equals(config.getAttribute(
ILaunchConstants.ATTR_CONNECTION_URI,
connectionUri))) {
if (imageName.equals(config.getAttribute(

Back to the top