Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2017-06-29 20:04:52 +0000
committerJeff Johnston2017-06-29 20:04:52 +0000
commit8930584b13303f29636213d7339f5c76e88d6df2 (patch)
treefb6361fde50afcca1361859d14582288ba0acd61
parent379e33af43ddae0181320cc0ba86c17d714019a7 (diff)
downloadorg.eclipse.cdt-8930584b13303f29636213d7339f5c76e88d6df2.tar.gz
org.eclipse.cdt-8930584b13303f29636213d7339f5c76e88d6df2.tar.xz
org.eclipse.cdt-8930584b13303f29636213d7339f5c76e88d6df2.zip
Fix problems in Build in Container support
- add check for null configuration in ContainerCommandLauncherFactory and return null - remove extraneous changeEvent method in ContainerTab
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java8
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java4
2 files changed, 8 insertions, 4 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java
index a5453eeb8c..271f173beb 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java
@@ -46,6 +46,10 @@ public class ContainerCommandLauncherFactory
.getActiveConfiguration();
IConfiguration cfg = ManagedBuildManager
.getConfigurationForDescription(cfgd);
+ // TODO: figure out why this occurs
+ if (cfg == null) {
+ return null;
+ }
IOptionalBuildProperties props = cfg.getOptionalBuildProperties();
if (props != null) {
String enablementProperty = props.getProperty(
@@ -69,6 +73,10 @@ public class ContainerCommandLauncherFactory
// check if container build enablement has been checked
IConfiguration cfg = ManagedBuildManager
.getConfigurationForDescription(cfgd);
+ // TODO: figure out why this occurs
+ if (cfg == null) {
+ return null;
+ }
IOptionalBuildProperties props = cfg.getOptionalBuildProperties();
if (props != null) {
String enablementProperty = props.getProperty(
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
index f2cb4b8e5a..0d69db41fd 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
@@ -550,10 +550,6 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements
connectionSelector.addModifyListener(connectionModifyListener);
}
- public void changeEvent(IDockerConnection connection, int event) {
- changeEvent(event);
- }
-
public void listChanged(IDockerConnection c,
java.util.List<IDockerImage> list) {
final IDockerImage[] finalList = list.toArray(new IDockerImage[0]);

Back to the top