From edb05572e8c25079cc75a93560092b35b75c81bb Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Fri, 29 May 2015 09:45:52 -0400
Subject: [PATCH 1/3] Catch case where Content is null

---
 Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 3223e29382..7e1dd9aa88 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -139,7 +139,7 @@ public final class ContentUtils {
                     return TimeZone.getDefault();
                 }
             }
-        } catch (TskException ex) {
+        } catch (TskException | NullPointerException ex) {
             return TimeZone.getDefault();
         }
     }

From a6c825996f4162d703c08523e6f584d8ed70cc53 Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Tue, 16 Jun 2015 12:14:33 -0400
Subject: [PATCH 2/3] Switching to a different version of controlsfx

---
 CoreLibs/ivy.xml                      | 3 ++-
 CoreLibs/nbproject/project.properties | 6 +++---
 CoreLibs/nbproject/project.xml        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 99c18a955b..a4cc0075e7 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,4 +1,5 @@
 
+
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
     <configurations >
@@ -36,7 +37,7 @@
         <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
         
         <!-- timeline and image analyzer -->
-        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.20.9" />
+        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.9" />
         <dependency conf="autopsy_core->*" org="org.controlsfx" name="openjfx-dialogs" rev="1.0.3"/>
 
         <!-- timeline and -->
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index e1ebd74bb7..53bd6cf9e0 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -12,7 +12,7 @@ file.reference.commons-lang3-3.0.jar=release/modules/ext/commons-lang3-3.0.jar
 file.reference.commons-logging-1.1.2-javadoc.jar=release/modules/ext/commons-logging-1.1.2-javadoc.jar
 file.reference.commons-logging-1.1.2-sources.jar=release/modules/ext/commons-logging-1.1.2-sources.jar
 file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
-file.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9.jar
+file.reference.controlsfx-8.40.9.jar=release/modules/ext/controlsfx-8.40.9.jar
 file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
 file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
 file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
@@ -59,6 +59,6 @@ file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
 file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
 javac.source=1.7
 javac.compilerargs=-Xlint -Xlint:-serial
-javadoc.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9-javadoc.jar
+javadoc.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.40.9-javadoc.jar
 nbm.needs.restart=true
-source.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9-sources.jar
+source.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.40.9-sources.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index ea65c1e7f9..a76fed8a8f 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -769,8 +769,8 @@
                 <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-8.20.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-8.20.9.jar</binary-origin>
+                <runtime-relative-path>ext/controlsfx-8.40.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/controlsfx-8.40.9.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path>

From f2e1c84f3677c9ade86dae9a3c8c4b4905002a07 Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Tue, 16 Jun 2015 12:16:54 -0400
Subject: [PATCH 3/3] Cleanup

---
 Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 7e1dd9aa88..3223e29382 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -139,7 +139,7 @@ public final class ContentUtils {
                     return TimeZone.getDefault();
                 }
             }
-        } catch (TskException | NullPointerException ex) {
+        } catch (TskException ex) {
             return TimeZone.getDefault();
         }
     }