diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java index 31110f984d..fd17a65d98 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java @@ -486,12 +486,6 @@ class SevenZipExtractor { unpackedTree.addDerivedFilesToCase(); unpackedFiles = unpackedTree.getAllFileObjects(); - if (!unpackedFiles.isEmpty()) { - //currently sending a single event for all new files - services.fireModuleContentEvent(new ModuleContentEvent(archiveFile)); - context.addFilesToJob(unpackedFiles); - } - //check if children are archives, update archive depth tracking for (AbstractFile unpackedFile : unpackedFiles) { if (isSevenZipExtractionSupported(unpackedFile)) { @@ -563,6 +557,13 @@ class SevenZipExtractor { archiveFile.getName(), EmbeddedFileExtractorModuleFactory.getModuleName()); services.postMessage(IngestMessage.createWarningMessage(EmbeddedFileExtractorModuleFactory.getModuleName(), msg, details)); } + + // adding unpacked extracted derived files to the job after closing relevant resources. + if (!unpackedFiles.isEmpty()) { + //currently sending a single event for all new files + services.fireModuleContentEvent(new ModuleContentEvent(archiveFile)); + context.addFilesToJob(unpackedFiles); + } } /**