From 811a547f7dc4a4f7b573c14bebf6204526ea1763 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 30 Jan 2017 12:45:17 +0300 Subject: [PATCH] javac ast indices: remove indices if java builder is disabled --- .../BackwardReferenceIndexBuilder.java | 17 +++++++---------- .../BackwardReferenceIndexWriter.java | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java index fc1f3dd46ed9..29047cfc5bab 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java @@ -24,7 +24,6 @@ import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.ModuleBasedTarget; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; -import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.CustomBuilderMessage; import org.jetbrains.jps.model.module.JpsModule; @@ -56,7 +55,7 @@ public class BackwardReferenceIndexBuilder extends ModuleLevelBuilder { @Override public void buildFinished(CompileContext context) { - if (JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { + if (BackwardReferenceIndexWriter.getInstance() != null) { final BuildTargetIndex targetIndex = context.getProjectDescriptor().getBuildTargetIndex(); for (JpsModule module : context.getProjectDescriptor().getProject().getModules()) { boolean allAreDummyOrCompiled = true; @@ -85,17 +84,15 @@ public class BackwardReferenceIndexBuilder extends ModuleLevelBuilder { ModuleChunk chunk, DirtyFilesHolder dirtyFilesHolder, OutputConsumer outputConsumer) throws ProjectBuildException, IOException { - if (dirtyFilesHolder.hasRemovedFiles()) { - final BackwardReferenceIndexWriter writer = BackwardReferenceIndexWriter.getInstance(); - if (writer != null) { - for (ModuleBuildTarget target : chunk.getTargets()) { - final Collection files = dirtyFilesHolder.getRemovedFiles(target); - writer.processDeletedFiles(files); - } + final BackwardReferenceIndexWriter writer = BackwardReferenceIndexWriter.getInstance(); + if (writer != null && dirtyFilesHolder.hasRemovedFiles()) { + for (ModuleBuildTarget target : chunk.getTargets()) { + final Collection files = dirtyFilesHolder.getRemovedFiles(target); + writer.processDeletedFiles(files); } } - if (JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { + if (writer != null) { for (ModuleBuildTarget target : chunk.getTargets()) { if (context.getScope().isWholeTargetAffected(target)) { myCompiledTargets.add(target); diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java index 54313d6b1a11..dadf58438a4b 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java +++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java @@ -65,7 +65,7 @@ public class BackwardReferenceIndexWriter { if (isEnabled()) { boolean isRebuild = isRebuildInAllJavaModules(context); - if (!JavaCompilers.JAVAC_ID.equals(JavaBuilder.getUsedCompilerId(context))) { + if (!JavaCompilers.JAVAC_ID.equals(JavaBuilder.getUsedCompilerId(context)) || !JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { CompilerBackwardReferenceIndex.removeIndexFiles(buildDir); return; }