From f18eeed75c19fba9a88f79902238f331c66b8dc7 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 14 Dec 2010 19:01:53 +0300
Subject: [PATCH] [r=grisha] get the value of isAnnotationProcessorsEnabled
 option from context

---
 .../src/com/intellij/compiler/impl/CompileDriver.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 436df551bc6d..dd503c74277e 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -221,7 +221,7 @@ public class CompileDriver {
     task.start(new Runnable() {
       public void run() {
         try {
-          myAllOutputDirectories = getAllOutputDirectories();
+          myAllOutputDirectories = getAllOutputDirectories(compileContext);
           // need this for updating zip archives experiment, uncomment if the feature is turned on
           //myOutputFinder = new OutputPathFinder(myAllOutputDirectories);
           status.set(doCompile(compileContext, false, false, false, true));
@@ -500,7 +500,7 @@ public class CompileDriver {
         return;
       }
 
-      myAllOutputDirectories = getAllOutputDirectories();
+      myAllOutputDirectories = getAllOutputDirectories(compileContext);
       // need this for updating zip archives experiment, uncomment if the feature is turned on
       //myOutputFinder = new OutputPathFinder(myAllOutputDirectories);
       status = doCompile(compileContext, isRebuild, forceCompile, trackDependencies, false);
@@ -1388,7 +1388,7 @@ public class CompileDriver {
     return isEmpty;
   }
 
-  private Set<File> getAllOutputDirectories() {
+  private Set<File> getAllOutputDirectories(CompileContext context) {
     final Set<File> outputDirs = new OrderedSet<File>((TObjectHashingStrategy<File>)TObjectHashingStrategy.CANONICAL);
     final Module[] modules = ModuleManager.getInstance(myProject).getModules();
     for (final String path : CompilerPathsEx.getOutputPaths(modules)) {
@@ -1399,7 +1399,7 @@ public class CompileDriver {
       outputDirs.add(new File(CompilerPaths.getGenerationOutputPath(pair.getFirst(), pair.getSecond(), true)));
     }
     final CompilerConfiguration config = CompilerConfiguration.getInstance(myProject);
-    if (config.isAnnotationProcessorsEnabled()) {
+    if (context.isAnnotationProcessorsEnabled()) {
       for (Module module : modules) {
         if (config.isAnnotationProcessingEnabled(module)) {
           final String path = CompilerPaths.getAnnotationProcessorsGenerationPath(module);