From e64e36ca848c7a4512043c99ffa7597bfb0c8c3f Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 1 Dec 2010 17:31:47 +0300 Subject: [PATCH] [r=ira] NPE fix --- .../openapi/roots/ui/configuration/ModulesConfigurator.java | 2 +- 1 file changed, 1 insertion(+), 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 8ce7f6bdb6b7..ed18f67a021e 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 @@ -272,7 +272,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change final VirtualFile correspondingContent = entry.getValue(); final String expectedModuleName = contentRootToModuleNameMap.get(correspondingContent); - for (VirtualFile candidateContent = srcRoot; !candidateContent.equals(correspondingContent); candidateContent = candidateContent.getParent()) { + for (VirtualFile candidateContent = srcRoot; candidateContent != null && !candidateContent.equals(correspondingContent); candidateContent = candidateContent.getParent()) { final String moduleName = contentRootToModuleNameMap.get(candidateContent); if (moduleName != null && !moduleName.equals(expectedModuleName)) { throw new ConfigurationException(