diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java index ed73c334a3d5..d7ad131b1b2a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java @@ -86,6 +86,7 @@ public class MavenProjectImporter { myModuleModel = modelsProvider.getModuleModel(); } + @Nullable public List importProject() { List postTasks = new ArrayList(); @@ -100,6 +101,8 @@ public class MavenProjectImporter { mapMavenProjectsToModulesAndNames(); + if (myProject.isDisposed()) return null; + boolean projectsHaveChanges = projectsToImportHaveChanges(); if (projectsHaveChanges) { hasChanges = true; @@ -112,6 +115,8 @@ public class MavenProjectImporter { configModuleGroups(); } + if (myProject.isDisposed()) return null; + boolean modulesDeleted = deleteObsoleteModules(); hasChanges |= modulesDeleted; if (hasChanges) {