From ad886ad73654f98e5c21af6eee47ff7c380b1b88 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 17 Dec 2014 13:21:58 -0500 Subject: [PATCH] Fix bug in ingest pipelines code --- .../autopsy/ingest/DataSourceIngestJob.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java index 1e320b2648..a1408ef6c2 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java @@ -660,13 +660,13 @@ final class DataSourceIngestJob { FileIngestPipeline pipeline = this.fileIngestPipelinesQueue.take(); if (!pipeline.isEmpty()) { AbstractFile file = task.getFile(); - ++this.processedFiles; // RJCTODO: This was previously inside the lock - if (this.runInteractively) { - /** - * Update the file ingest progress bar. - */ - synchronized (this.fileIngestProgressLock) { + synchronized (this.fileIngestProgressLock) { + ++this.processedFiles; + if (this.runInteractively) { + /** + * Update the file ingest progress bar. + */ if (this.processedFiles <= this.estimatedFilesToProcess) { this.fileIngestProgress.progress(file.getName(), (int) this.processedFiles); } else {