diff options
| author | Jonah Graham | 2020-09-07 01:43:04 +0000 |
|---|---|---|
| committer | Jonah Graham | 2020-09-07 01:47:32 +0000 |
| commit | 983005e3c4c0a93b2fb0de3912fd53abf1d3df98 (patch) | |
| tree | c63b3f4a6a04a13a2489bb06199a3154b8f77eba | |
| parent | 10e74dda5225ac378729ceaaaf02c2f5341343db (diff) | |
| download | org.eclipse.cdt-983005e3c4c0a93b2fb0de3912fd53abf1d3df98.tar.gz org.eclipse.cdt-983005e3c4c0a93b2fb0de3912fd53abf1d3df98.tar.xz org.eclipse.cdt-983005e3c4c0a93b2fb0de3912fd53abf1d3df98.zip | |
Bug 566712: Fix NPE on last item in list delete
Change-Id: I9fe2f5b51be7389c8e09c4461a878f982d765695
| -rw-r--r-- | launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java | 6 |
1 files changed, 6 insertions, 0 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 23579188a1a..13ce4b4bb4a 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 @@ -145,6 +145,12 @@ public class ContainerCommandLauncherFactory implements ICommandLauncherFactory, public void registerLanguageSettingEntries(IProject project, List<? extends ICLanguageSettingEntry> langEntries) { @SuppressWarnings("unchecked") List<ICLanguageSettingEntry> entries = (List<ICLanguageSettingEntry>) langEntries; + if (langEntries == null) { + // langEntries can be null when the last item is removed from a list, + // see org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsEntriesTab.saveEntries(ILanguageSettingsProvider, List<ICLanguageSettingEntry>) + // for an example that passes null to mean "use parent entries instead". + return; + } ICConfigurationDescription cfgd = CoreModel.getDefault().getProjectDescription(project) .getActiveConfiguration(); IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgd); |