From e4d798de53de5e8e2e602744a7aad93f262e75b3 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 17 Sep 2015 16:23:08 +0300
Subject: [PATCH] external system: create empty content root directories under
 write action

---
 .../manage/ContentRootDataService.java        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java
index 3dab3141671d..765e4bdeddf1 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java
@@ -176,7 +176,7 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
   }
 
   private static void createSourceRootIfAbsent(
-    @NotNull ContentEntry entry, @NotNull SourceRoot root, @NotNull String moduleName,
+    @NotNull ContentEntry entry, @NotNull final SourceRoot root, @NotNull String moduleName,
     @NotNull JpsModuleSourceRootType<?> sourceRootType, boolean generated, boolean createEmptyContentRootDirectories) {
     List<SourceFolder> folders = entry.getSourceFolders(sourceRootType);
     for (SourceFolder folder : folders) {
@@ -200,12 +200,17 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
       }
     }
     if(createEmptyContentRootDirectories) {
-      try {
-        VfsUtil.createDirectoryIfMissing(root.getPath());
-      }
-      catch (IOException e) {
-        LOG.warn(String.format("Unable to create directory for the path: %s", root.getPath()), e);
-      }
+      ExternalSystemApiUtil.doWriteAction(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            VfsUtil.createDirectoryIfMissing(root.getPath());
+          }
+          catch (IOException e) {
+            LOG.warn(String.format("Unable to create directory for the path: %s", root.getPath()), e);
+          }
+        }
+      });
     }
   }