From 99c85aa824fa03f54963438a0a19a8b54977ea32 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Fri, 18 May 2012 09:41:43 -0400
Subject: [PATCH] Correct error handling when ingest exception occurs while
 extracting strings during ingest, need to bail out.

---
 .../src/org/sleuthkit/autopsy/keywordsearch/FileExtract.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileExtract.java
index 4e4ba22395..ab430440ca 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileExtract.java
@@ -82,6 +82,7 @@ public class FileExtract {
                 } catch (IngesterException ingEx) {
                     success = false;
                     logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);   
+                    throw ingEx; //need to rethrow/return to signal error and move on
                 } 
                 //debug.close();    
             }
@@ -98,7 +99,7 @@ public class FileExtract {
                 try {
                     stringStream.close();
                 } catch (IOException ex) {
-                    Exceptions.printStackTrace(ex);
+                    logger.log(Level.WARNING, "Error closing string stream, file: " + sourceFile.getName(), ex);
                 }
             }
         }