From c071a15571fa1c60649e00ff6813842dc0448d4d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 6 Jul 2017 11:10:38 -0400
Subject: [PATCH] Fix merge error in FileTypesByExtension

---
 .../org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java
index c1d9280d31..8da58193bc 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java
@@ -46,6 +46,7 @@ import org.sleuthkit.datamodel.TskData;
  */
 public final class FileTypesByExtension implements AutopsyVisitableItem {
 
+    private static final Logger logger = Logger.getLogger(FileTypesByExtension.class.getName());    
     private final SleuthkitCase skCase;
 
     public FileTypesByExtension(SleuthkitCase skCase) {
@@ -118,7 +119,7 @@ public final class FileTypesByExtension implements AutopsyVisitableItem {
                     }
                 } catch (TskCoreException tskCoreException) {
                     showCounts = false;
-                    LOGGER.log(Level.SEVERE, "Error counting files.", tskCoreException);
+                    logger.log(Level.SEVERE, "Error counting files.", tskCoreException);
                 }
             }
             return showCounts;