codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-04 08:16:16 +00:00
Code Issues Releases Wiki Activity

Prevent shutDown from being called on ingest pipelines that haven't started.

Browse Source
This commit is contained in:
Ann Priestman
2015-07-17 09:49:58 -04:00
parent b4ee3471eb
commit 5074684466
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
+8 -4
View File
@@ -386,9 +386,11 @@ final class DataSourceIngestJob {
// errors are likely redundant.
while (!this.fileIngestPipelinesQueue.isEmpty()) {
pipeline = this.fileIngestPipelinesQueue.poll();
List<IngestModuleError> shutDownErrors = pipeline.shutDown();
if (!shutDownErrors.isEmpty()) {
logIngestModuleErrors(shutDownErrors);
if(pipeline.isRunning()){
List<IngestModuleError> shutDownErrors = pipeline.shutDown();
if (!shutDownErrors.isEmpty()) {
logIngestModuleErrors(shutDownErrors);
}
}
}
break;
@@ -565,7 +567,9 @@ final class DataSourceIngestJob {
List<IngestModuleError> errors = new ArrayList<>();
while (!this.fileIngestPipelinesQueue.isEmpty()) {
FileIngestPipeline pipeline = fileIngestPipelinesQueue.poll();
errors.addAll(pipeline.shutDown());
if(pipeline.isRunning()){
errors.addAll(pipeline.shutDown());
}
}
if (!errors.isEmpty()) {
logIngestModuleErrors(errors);