From ee96eb86c8ea1e0c6f351b2291be7181324b281c Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 25 Sep 2015 12:58:56 +0300 Subject: [PATCH] EA-65889 - NPE: ModuleDeleteProvider.removeModule --- .../openapi/roots/ui/configuration/ModulesConfigurator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java index 75c90c41d95d..25b4a7c01e6b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java @@ -55,6 +55,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ModifiableArtifactModel; import com.intellij.projectImport.ProjectImportBuilder; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -486,7 +487,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change List modifiableRootModels = new ArrayList(); for (final ModuleEditor moduleEditor : myModuleEditors.values()) { final ModifiableRootModel modifiableRootModel = moduleEditor.getModifiableRootModelProxy(); - modifiableRootModels.add(modifiableRootModel); + ContainerUtil.addIfNotNull(modifiableRootModels, modifiableRootModel); } // destroyProcess editor