mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-08 09:35:23 +02:00
Code Issues Wiki Activity

Bug 530053 - Launching locally after Container launch doesn't work

Browse source 
- 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 64154f20f2)
This commit is contained in:
Jeff Johnston 2018-01-22 14:58:40 -05:00
parent 92c4d05dfb
commit d1f3705e0f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java
View file

@ -299,7 +299,8 @@ public class LaunchShortcut implements ILaunchShortcut {
// if we have an active configuration with container // if we have an active configuration with container
// build properties, make sure they match, otherwise // build properties, make sure they match, otherwise
// add the launch config as a candidate // add the launch config as a candidate
if (connectionUri.equals(config.getAttribute( if (connectionUri != null
&& connectionUri.equals(config.getAttribute(
ILaunchConstants.ATTR_CONNECTION_URI, ILaunchConstants.ATTR_CONNECTION_URI,
connectionUri))) { connectionUri))) {
if (imageName.equals(config.getAttribute( if (imageName.equals(config.getAttribute(