update for comment

This commit is contained in:
Greg DiCristofaro 2020-06-30 11:37:04 -04:00
parent 0f9fbc12c5
commit 7abda4855b

View File

@ -338,8 +338,8 @@ public class Installer extends ModuleInstall {
} }
/** /**
* Make a folder in the config directory for object detection classifiers if one does not * Make a folder in the config directory for object detection classifiers if
* exist. * one does not exist.
*/ */
private static void ensureClassifierFolderExists() { private static void ensureClassifierFolderExists() {
File objectDetectionClassifierDir = new File(PlatformUtil.getObjectDetectionClassifierPath()); File objectDetectionClassifierDir = new File(PlatformUtil.getObjectDetectionClassifierPath());
@ -396,10 +396,11 @@ public class Installer extends ModuleInstall {
logger.log(Level.INFO, "Autopsy Core restore completed"); //NON-NLS logger.log(Level.INFO, "Autopsy Core restore completed"); //NON-NLS
preloadJython(); preloadJython();
} }
/** /**
* Initializes 7zip-java bindings. * Initializes 7zip-java bindings. We are performing initialization once
* because we encountered issues related to file locking when initialization
* was performed closer to where the bindings are used. See JIRA-6528.
*/ */
private void initializeSevenZip() { private void initializeSevenZip() {
try { try {
@ -409,7 +410,7 @@ public class Installer extends ModuleInstall {
logger.log(Level.SEVERE, "Error loading 7zip-java bindings", e); //NON-NLS logger.log(Level.SEVERE, "Error loading 7zip-java bindings", e); //NON-NLS
} }
} }
/** /**
* Runs an initial load of the Jython modules to speed up subsequent loads. * Runs an initial load of the Jython modules to speed up subsequent loads.
*/ */
@ -418,13 +419,12 @@ public class Installer extends ModuleInstall {
try { try {
JythonModuleLoader.getIngestModuleFactories(); JythonModuleLoader.getIngestModuleFactories();
JythonModuleLoader.getGeneralReportModules(); JythonModuleLoader.getGeneralReportModules();
} } catch (Exception ex) {
catch (Exception ex) {
// This is a firewall exception to ensure that any possible exception caused // This is a firewall exception to ensure that any possible exception caused
// by this initial load of the Jython modules are caught and logged. // by this initial load of the Jython modules are caught and logged.
logger.log(Level.SEVERE, "There was an error while doing an initial load of python plugins.", ex); logger.log(Level.SEVERE, "There was an error while doing an initial load of python plugins.", ex);
} }
}; };
new Thread(loader).start(); new Thread(loader).start();
} }