From c890d69ac58f8ffc3f590a07335aea57df238fcd Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 4 Jan 2012 14:52:44 -0500
Subject: [PATCH] bugfix, fixed null ptr exception for some cases when there is
 no highlight snippet

---
 .../autopsy/keywordsearch/KeywordSearchFilterNode.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
index 8e342e01bb..0d1932a9c2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.keywordsearch;
 
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -64,7 +65,12 @@ class KeywordSearchFilterNode extends FilterNode {
 
         try {
             QueryResponse response = solrCore.query(q);
-            List<String> contentHighlights = response.getHighlighting().get(Long.toString(content.getId())).get("content");
+            Map<String,Map<String,List<String>>>responseHighlight = response.getHighlighting();
+            long contentID = content.getId();
+            Map<String,List<String>>responseHighlightID = responseHighlight.get(Long.toString(contentID));
+            if (responseHighlightID == null)
+                return "";
+            List<String> contentHighlights = responseHighlightID.get("content");
             if (contentHighlights == null) {
                 return "";
             } else {