From d73e46ff80d465404d03ed1bdbb8d7a95d85cdd8 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Mon, 13 Jun 2022 20:12:52 -0400
Subject: [PATCH] wait for ingest to complete before proceeding to report

---
 .../autopsy/commandlineingest/CommandLineIngestManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 7b9686e1c4..6823e8f9f2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -515,7 +515,10 @@ public class CommandLineIngestManager extends CommandLineManager {
                              * listener or until interrupted because auto ingest
                              * is shutting down.
                              */
-                            ingestLock.wait();
+                            do {
+                                ingestLock.wait();
+                            } while (IngestManager.getInstance().isIngestRunning());
+
                             LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath());
                             IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
                             IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot();