SONAR-5433 Fix concurrent modification error with big projects

1 files changed, 3 insertions, 7 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
index 81eb9b0e4da..9822738c31a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
@@ -92,7 +92,9 @@ public class FileIndexer implements BatchComponent {
 
     executor.shutdown();
     try {
-      executor.awaitTermination(10, TimeUnit.SECONDS);
+      while (!executor.awaitTermination(10, TimeUnit.SECONDS)) {
+        LOG.debug("{} files indexed...", progress.count());
+      }
     } catch (InterruptedException e) {
       throw new IllegalStateException("FileIndexer was interrupted", e);
     }
@@ -121,12 +123,6 @@ public class FileIndexer implements BatchComponent {
     }
   }
 
-  private void indexFiles(InputFileBuilder inputFileBuilder, DefaultModuleFileSystem fileSystem, Progress progress, List<File> sourceFiles, InputFile.Type type) {
-    for (File sourceFile : sourceFiles) {
-      indexFile(inputFileBuilder, fileSystem, progress, sourceFile, type);
-    }
-  }
-
   private void indexDirectory(InputFileBuilder inputFileBuilder, DefaultModuleFileSystem fileSystem, Progress status, File dirToIndex, InputFile.Type type) {
     Collection<File> files = FileUtils.listFiles(dirToIndex, FILE_FILTER, DIR_FILTER);
     for (File file : files) {