From d1f3705e0f1d6e43b5acdc036d35c91a143db6bb Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 22 Jan 2018 14:58:40 -0500 Subject: [PATCH] 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 (cherry picked from commit 64154f20f263899775b90f2d2db0407ad55bbb02) --- .../eclipse/cdt/internal/docker/launcher/LaunchShortcut.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(