From 2397ffd6f9fbcc83423b466083512dcbdeaf2081 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 31 Mar 2010 17:35:52 +0400 Subject: [PATCH] EA-19512 - AE: ComponentManagerImpl.getStateStore --- .../openapi/components/impl/ModulePathMacroManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java index 54c20f336f8e..aac6a5b317eb 100644 --- a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java @@ -56,7 +56,7 @@ public class ModulePathMacroManager extends BasePathMacroManager /*ProjectPathMa } private void getExpandModuleHomeReplacements(ExpandMacroToPathMap result) { - String moduleDir = getModuleDir(myModule.getModuleFilePath()); + String moduleDir = myModule.isDisposed() ? null : getModuleDir(myModule.getModuleFilePath()); if (moduleDir == null) return; File f = new File(moduleDir.replace('/', File.separatorChar)); @@ -77,7 +77,7 @@ public class ModulePathMacroManager extends BasePathMacroManager /*ProjectPathMa } private void getModuleHomeReplacements(@NonNls ReplacePathToMacroMap result, final boolean addRelativePathMacros) { - String moduleDir = getModuleDir(myModule.getModuleFilePath()); + String moduleDir = myModule.isDisposed() ? null : getModuleDir(myModule.getModuleFilePath()); if (moduleDir == null) return; File f = new File(moduleDir.replace('/', File.separatorChar));