Merge remote-tracking branch 'upstream/develop' into 2103-ingest-task-sched-concurrency

This commit is contained in:
Richard Cordovano 2018-03-19 14:12:15 -04:00
commit 03e99cd719
2 changed files with 11 additions and 2 deletions

View File

@ -51,13 +51,22 @@ abstract class Extract {
Extract() {
}
void init() throws IngestModuleException {
final void init() throws IngestModuleException {
try {
currentCase = Case.getOpenCase();
tskCase = currentCase.getSleuthkitCase();
} catch (NoCurrentCaseException ex) {
throw new IngestModuleException(Bundle.Extract_indexError_message(), ex);
}
configExtractor();
}
/**
* Override to add any module-specific configuration
*
* @throws IngestModuleException
*/
void configExtractor() throws IngestModuleException {
}
abstract void process(Content dataSource, IngestJobContext context);

View File

@ -393,7 +393,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
}
@Override
void init() throws IngestModuleException {
void configExtractor() throws IngestModuleException {
try {
PlatformUtil.extractResourceToUserConfigDir(SearchEngineURLQueryAnalyzer.class, XMLFILE, true);
} catch (IOException e) {