mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 19:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1439 from APriestman/pipelineShutdown

Browse Source 
Prevent shutDown from being called on ingest pipelines that haven't s…
This commit is contained in:
Richard Cordovano 2015-07-19 13:42:07 -04:00
commit 2d4cd6dd69
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
View File

@ -386,9 +386,11 @@ final class DataSourceIngestJob {
// errors are likely redundant. // errors are likely redundant.
while (!this.fileIngestPipelinesQueue.isEmpty()) { while (!this.fileIngestPipelinesQueue.isEmpty()) {
pipeline = this.fileIngestPipelinesQueue.poll(); pipeline = this.fileIngestPipelinesQueue.poll();
List<IngestModuleError> shutDownErrors = pipeline.shutDown(); if(pipeline.isRunning()){
if (!shutDownErrors.isEmpty()) { List<IngestModuleError> shutDownErrors = pipeline.shutDown();
logIngestModuleErrors(shutDownErrors); if (!shutDownErrors.isEmpty()) {
logIngestModuleErrors(shutDownErrors);
}
} }
} }
break; break;
@ -565,7 +567,9 @@ final class DataSourceIngestJob {
List<IngestModuleError> errors = new ArrayList<>(); List<IngestModuleError> errors = new ArrayList<>();
while (!this.fileIngestPipelinesQueue.isEmpty()) { while (!this.fileIngestPipelinesQueue.isEmpty()) {
FileIngestPipeline pipeline = fileIngestPipelinesQueue.poll(); FileIngestPipeline pipeline = fileIngestPipelinesQueue.poll();
errors.addAll(pipeline.shutDown()); if(pipeline.isRunning()){
errors.addAll(pipeline.shutDown());
}
} }
if (!errors.isEmpty()) { if (!errors.isEmpty()) {
logIngestModuleErrors(errors); logIngestModuleErrors(errors);