From 00ba1b610aca057d786683e726af5ddd5de6938f Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Thu, 22 May 2014 14:44:33 -0400 Subject: [PATCH] Make sure ingest jobs with empty directories finish --- .../autopsy/ingest/FileIngestTaskScheduler.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java index dab773d74a..4727f30ebc 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java @@ -83,21 +83,18 @@ final class FileIngestTaskScheduler implements IngestTaskQueue { } } - // Enqueue file ingest tasks for the top level files. - boolean fileTasksAdded = false; + // Try to enqueue file ingest tasks for the top level files. for (AbstractFile firstLevelFile : topLevelFiles) { FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile); if (shouldEnqueueTask(fileTask)) { synchronized (this) { rootDirectoryTasksQueue.add(fileTask); } - fileTasksAdded = true; } } - if (fileTasksAdded) { - updateTaskQueues(); - } - return fileTasksAdded; + updateTaskQueues(); + + return !fileTasks.isEmpty(); } void scheduleTask(IngestJob job, AbstractFile file) throws InterruptedException {