From c8508ecdf37494a7aaadf045213256157a59699c Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 3 Mar 2014 17:23:55 -0500
Subject: [PATCH] Added call to get() to retrieve keyword search errors in
 background thread

---
 .../keywordsearch/KeywordSearchIngestModule.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index 7220d4d485..a4f0b78921 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
@@ -44,7 +45,6 @@ import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
 import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
 import org.netbeans.api.progress.aggregate.ProgressContributor;
 import org.openide.util.Cancellable;
-import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
@@ -1183,6 +1183,18 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile {
 
             return null;
         }
+        
+        @Override
+        protected void done() {
+            // call get to see if there were any errors
+            try {
+                get();
+            }
+            catch (InterruptedException | ExecutionException e) {
+                logger.log(Level.SEVERE, "Error performing keyword search: " + e.getMessage());
+                services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, "Error performing keyword search", e.getMessage()));
+            }
+        }
 
         /**
          * Sync-up the updated keywords from the currently used lists in the XML