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

3087 changed order of Correlation Engine Startup method, per comments on PR

Browse Source
This commit is contained in:
William Schaefer 2017-09-28 17:53:20 -04:00
parent 746fbee28f
commit 0ec85b97f5
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
View File

@ -225,38 +225,34 @@ class IngestModule implements FileIngestModule {
LOGGER.log(Level.SEVERE, "Error getting correlation type FILES in ingest module start up.", ex); // NON-NLS LOGGER.log(Level.SEVERE, "Error getting correlation type FILES in ingest module start up.", ex); // NON-NLS
throw new IngestModuleException("Error getting correlation type FILES in ingest module start up.", ex); // NON-NLS throw new IngestModuleException("Error getting correlation type FILES in ingest module start up.", ex); // NON-NLS
} }
// ensure we have this case defined in the EAM DB
CorrelationCase existingCase;
Case curCase = Case.getCurrentCase(); Case curCase = Case.getCurrentCase();
CorrelationCase curCeCase = new CorrelationCase(
-1,
curCase.getName(), // unique case ID
EamOrganization.getDefault(),
curCase.getDisplayName(),
curCase.getCreatedDate(),
curCase.getNumber(),
curCase.getExaminer(),
null,
null,
null);
try {
existingCase = dbManager.getCaseByUUID(curCeCase.getCaseUUID());
if (existingCase == null) {
dbManager.newCase(curCeCase);
}
} catch (EamDbException ex) {
LOGGER.log(Level.SEVERE, "Error creating new case in ingest module start up.", ex); // NON-NLS
throw new IngestModuleException("Error creating new case in ingest module start up.", ex); // NON-NLS
}
try { try {
eamCase = dbManager.getCaseByUUID(curCase.getName()); eamCase = dbManager.getCaseByUUID(curCase.getName());
//will have been created above where existingCase is null checked //will have been created above where existingCase is null checked
} catch (EamDbException ex) { } catch (EamDbException ex) {
throw new IngestModuleException("Unable to get case from central repository database ", ex); throw new IngestModuleException("Unable to get case from central repository database ", ex);
} }
if (eamCase == null) {
// ensure we have this case defined in the EAM DB
CorrelationCase curCeCase = new CorrelationCase(
-1,
curCase.getName(), // unique case ID
EamOrganization.getDefault(),
curCase.getDisplayName(),
curCase.getCreatedDate(),
curCase.getNumber(),
curCase.getExaminer(),
null,
null,
null);
try {
dbManager.newCase(curCeCase);
eamCase = dbManager.getCaseByUUID(curCase.getName());
} catch (EamDbException ex) {
LOGGER.log(Level.SEVERE, "Error creating new case in ingest module start up.", ex); // NON-NLS
throw new IngestModuleException("Error creating new case in ingest module start up.", ex); // NON-NLS
}
}
try { try {
eamDataSource = CorrelationDataSource.fromTSKDataSource(eamCase, context.getDataSource()); eamDataSource = CorrelationDataSource.fromTSKDataSource(eamCase, context.getDataSource());