From 95cf21312e1fc22ec98bbfd6009b8fa68d1a3ade Mon Sep 17 00:00:00 2001
From: "Samuel H. Kenyon" <skenyon@basistech.com>
Date: Wed, 16 Apr 2014 15:07:28 -0400
Subject: [PATCH] FileTypeID module: thread-safety tweak and comments

---
 .../autopsy/modules/filetypeid/FileTypeDetectionInterface.java | 3 +++
 .../autopsy/modules/filetypeid/FileTypeIdModuleSettings.java   | 2 +-
 .../autopsy/modules/filetypeid/TikaFileTypeDetector.java       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
index d748578f91..d1514e91ef 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
@@ -29,6 +29,9 @@ import org.sleuthkit.datamodel.AbstractFile;
  */
 interface FileTypeDetectionInterface {
 
+    /**
+     * Instances of this data structure are not shared between threads
+     */
     public class FileIdInfo {
 
         public String type;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
index 3dbb50c8a9..26caff787d 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
@@ -25,7 +25,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
  */
 public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings {
 
-    private boolean skipKnownFiles = true;
+    private volatile boolean skipKnownFiles = true;
 
     FileTypeIdModuleSettings() {
     }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
index 06794331c7..e51ad24bc2 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
@@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.AbstractFile;
 
 class TikaFileTypeDetector implements FileTypeDetectionInterface {
 
-    private static Tika tikaInst = new Tika();
+    private static Tika tikaInst = new Tika(); //calling detect() with this should be thread-safe
 
     @Override
     public FileTypeDetectionInterface.FileIdInfo attemptMatch(AbstractFile abstractFile) {