From e8f1e781883d67aabd7b0f2bc09ce4a0fc66d7a7 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 8 Feb 2017 21:25:09 +0100 Subject: [PATCH] fix files comparison (use file_hashing_strategy) while checking roots intersection on rebuild (IDEA-167595) --- .../src/org/jetbrains/jps/incremental/IncProjectBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java index f8c977b1096d..8da560dc510f 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java @@ -574,7 +574,7 @@ public class IncProjectBuilder { private void clearOutputs(CompileContext context) throws ProjectBuildException { final long cleanStart = System.currentTimeMillis(); final MultiMap> rootsToDelete = MultiMap.createSet(); - final Set allSourceRoots = new HashSet(); + final Set allSourceRoots = ContainerUtil.newTroveSet(FileUtil.FILE_HASHING_STRATEGY); final ProjectDescriptor projectDescriptor = context.getProjectDescriptor(); final List> allTargets = projectDescriptor.getBuildTargetIndex().getAllTargets(); @@ -631,7 +631,7 @@ public class IncProjectBuilder { okToDelete = false; } else { - final Set _outRoot = Collections.singleton(outputRoot); + final Set _outRoot = ContainerUtil.newTroveSet(FileUtil.FILE_HASHING_STRATEGY, outputRoot); for (File srcRoot : allSourceRoots) { if (JpsPathUtil.isUnder(_outRoot, srcRoot)) { okToDelete = false;