From abd90c58d119145ee482fecd855b11aa0ee30199 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 5 Nov 2012 17:51:33 +0100 Subject: [PATCH] when running module level builders make sure files from LAST_ROUND_DELTA are returned for ModuleBuildTarget only and not for other targets: (IDEA-94173 Leda maven build errors) --- .../org/jetbrains/jps/incremental/fs/BuildFSState.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java index 82b6a33daf75..f826e65d7c81 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java @@ -13,6 +13,7 @@ import org.jetbrains.jps.builders.FileProcessor; import org.jetbrains.jps.builders.impl.BuildTargetChunk; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.CompileScope; +import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.Utils; import org.jetbrains.jps.incremental.storage.Timestamps; @@ -48,9 +49,12 @@ public class BuildFSState extends FSState { @Override public Map> getSourcesToRecompile(@NotNull CompileContext context, BuildTarget target) { - final FilesDelta lastRoundDelta = getRoundDelta(LAST_ROUND_DELTA_KEY, context); - if (lastRoundDelta != null) { - return lastRoundDelta.getSourcesToRecompile(); + if (target instanceof ModuleBuildTarget) { + // multiple compilation rounds are applicable to ModuleBuildTarget only + final FilesDelta lastRoundDelta = getRoundDelta(LAST_ROUND_DELTA_KEY, context); + if (lastRoundDelta != null) { + return lastRoundDelta.getSourcesToRecompile(); + } } return super.getSourcesToRecompile(context, target); }