From 983005e3c4c0a93b2fb0de3912fd53abf1d3df98 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Sun, 6 Sep 2020 21:43:04 -0400 Subject: Bug 566712: Fix NPE on last item in list delete Change-Id: I9fe2f5b51be7389c8e09c4461a878f982d765695 --- .../cdt/docker/launcher/ContainerCommandLauncherFactory.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 langEntries) { @SuppressWarnings("unchecked") List entries = (List) 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) + // 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); -- cgit v1.2.3