From aef802f1348946a17d030f30112085d80b16f66c Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Mon, 24 Sep 2012 14:08:41 -0400
Subject: [PATCH] Handle errors better, prevent null ptr exc in Extract

---
 .../src/org/sleuthkit/autopsy/recentactivity/Extract.java    | 5 +----
 .../autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index 5767dcb83a..ac44fc9a61 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -36,7 +36,7 @@ abstract public class Extract implements IngestModuleImage{
     protected Case currentCase = Case.getCurrentCase(); // get the most updated case
     protected SleuthkitCase tskCase = currentCase.getSleuthkitCase();
     public final Logger logger = Logger.getLogger(this.getClass().getName());
-    protected ArrayList<String> errorMessages = null;
+    protected final ArrayList<String> errorMessages = new ArrayList<String>();
     protected String moduleName = "";
     
     //hide public constructor to prevent from instantiation by ingest module loader
@@ -45,9 +45,6 @@ abstract public class Extract implements IngestModuleImage{
     }
     
     List<String> getErrorMessages() {
-        if(errorMessages == null) {
-            errorMessages = new ArrayList<String>();
-        }
         return errorMessages;
     }
 
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index 9d088e91f8..e6dc949187 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -163,6 +163,9 @@ public class SearchEngineURLQueryAnalyzer extends Extract implements IngestModul
      */
     
     private static SearchEngine getSearchEngine(String domain){     
+        if (engines == null) {
+            return SearchEngineURLQueryAnalyzer.NullEngine;
+        }
             for(int i = 0; i < engines.length; i++){
                     if(domain.contains(engines[i].getDomainSubstring())){
                         return engines[i];