From e6b290367a733ff33e9dbea31f607f66b61ebf3f Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Tue, 7 Dec 2010 11:55:19 +0300
Subject: [PATCH] assertion fixed (Read access is allowed from event dispatch
 thread or inside read-action) [r=ann]

---
 .../configurations/RunConfigurationModule.java      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
index 43fdf26a15e4..d7d9638d9569 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
@@ -17,14 +17,13 @@
 package com.intellij.execution.configurations;
 
 import com.intellij.execution.ExecutionBundle;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.JDOMExternalizable;
-import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.openapi.util.*;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
@@ -85,7 +84,13 @@ public class RunConfigurationModule implements JDOMExternalizable {
 
   @Nullable
   public Module findModule(final String moduleName) {
-    return getModuleManager().findModuleByName(moduleName);
+    return ApplicationManager.getApplication().runReadAction(new Computable<Module>() {
+      @Nullable
+      @Override
+      public Module compute() {
+        return getModuleManager().findModuleByName(moduleName);
+      }
+    });
   }
 
   public void setModule(final Module module) {