From cf75e76e930a9c238e5c91d787cf71b20b13a571 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 20 Mar 2012 14:21:11 +0100
Subject: [PATCH] do not perform initial vfs lookup of output roots in
 compile-server mode

---
 .../intellij/compiler/impl/CompileDriver.java | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 0d7a54633fec..54efeb29a62a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -154,23 +154,25 @@ public class CompileDriver {
 
     myGenerationCompilerModuleToOutputDirMap = new HashMap<Pair<IntermediateOutputCompiler, Module>, Pair<VirtualFile, VirtualFile>>();
 
-    final LocalFileSystem lfs = LocalFileSystem.getInstance();
-    final IntermediateOutputCompiler[] generatingCompilers = CompilerManager.getInstance(myProject).getCompilers(IntermediateOutputCompiler.class, myCompilerFilter);
-    final Module[] allModules = ModuleManager.getInstance(myProject).getModules();
-    final CompilerConfiguration config = CompilerConfiguration.getInstance(project);
-    for (Module module : allModules) {
-      for (IntermediateOutputCompiler compiler : generatingCompilers) {
-        final VirtualFile productionOutput = lookupVFile(lfs, CompilerPaths.getGenerationOutputPath(compiler, module, false));
-        final VirtualFile testOutput = lookupVFile(lfs, CompilerPaths.getGenerationOutputPath(compiler, module, true));
-        final Pair<IntermediateOutputCompiler, Module> pair = new Pair<IntermediateOutputCompiler, Module>(compiler, module);
-        final Pair<VirtualFile, VirtualFile> outputs = new Pair<VirtualFile, VirtualFile>(productionOutput, testOutput);
-        myGenerationCompilerModuleToOutputDirMap.put(pair, outputs);
-      }
-      if (config.isAnnotationProcessorsEnabled()) {
-        if (config.isAnnotationProcessingEnabled(module)) {
-          final String path = CompilerPaths.getAnnotationProcessorsGenerationPath(module);
-          if (path != null) {
-            lookupVFile(lfs, path);  // ensure the file is created and added to VFS
+    if (!useCompileServer()) {
+      final LocalFileSystem lfs = LocalFileSystem.getInstance();
+      final IntermediateOutputCompiler[] generatingCompilers = CompilerManager.getInstance(myProject).getCompilers(IntermediateOutputCompiler.class, myCompilerFilter);
+      final Module[] allModules = ModuleManager.getInstance(myProject).getModules();
+      final CompilerConfiguration config = CompilerConfiguration.getInstance(project);
+      for (Module module : allModules) {
+        for (IntermediateOutputCompiler compiler : generatingCompilers) {
+          final VirtualFile productionOutput = lookupVFile(lfs, CompilerPaths.getGenerationOutputPath(compiler, module, false));
+          final VirtualFile testOutput = lookupVFile(lfs, CompilerPaths.getGenerationOutputPath(compiler, module, true));
+          final Pair<IntermediateOutputCompiler, Module> pair = new Pair<IntermediateOutputCompiler, Module>(compiler, module);
+          final Pair<VirtualFile, VirtualFile> outputs = new Pair<VirtualFile, VirtualFile>(productionOutput, testOutput);
+          myGenerationCompilerModuleToOutputDirMap.put(pair, outputs);
+        }
+        if (config.isAnnotationProcessorsEnabled()) {
+          if (config.isAnnotationProcessingEnabled(module)) {
+            final String path = CompilerPaths.getAnnotationProcessorsGenerationPath(module);
+            if (path != null) {
+              lookupVFile(lfs, path);  // ensure the file is created and added to VFS
+            }
           }
         }
       }