From 7abda4855b2bc539819fa01023cfb9dc6adfa3fb Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 30 Jun 2020 11:37:04 -0400 Subject: [PATCH] update for comment --- .../org/sleuthkit/autopsy/core/Installer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java index 2b6a2ca81c..3bc6d6a911 100644 --- a/Core/src/org/sleuthkit/autopsy/core/Installer.java +++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java @@ -338,8 +338,8 @@ public class Installer extends ModuleInstall { } /** - * Make a folder in the config directory for object detection classifiers if one does not - * exist. + * Make a folder in the config directory for object detection classifiers if + * one does not exist. */ private static void ensureClassifierFolderExists() { 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 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() { try { @@ -409,7 +410,7 @@ public class Installer extends ModuleInstall { 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. */ @@ -418,13 +419,12 @@ public class Installer extends ModuleInstall { try { JythonModuleLoader.getIngestModuleFactories(); JythonModuleLoader.getGeneralReportModules(); - } - catch (Exception ex) { + } catch (Exception ex) { // This is a firewall exception to ensure that any possible exception caused // 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); } - + }; new Thread(loader).start(); }