From 0890cccc7c54bb4bf2a0fd33e9f9a99b2f16c71f Mon Sep 17 00:00:00 2001 From: adam-m Date: Thu, 9 May 2013 11:24:44 -0400 Subject: [PATCH] keyword search module: handle case if input has no image when keeping track of what to reprocess --- .../autopsy/keywordsearch/KeywordSearchIngestModule.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index aa0f80f26e..f75ee76e29 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -44,7 +44,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.StopWatch; @@ -61,6 +60,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.ReadContentInputStream; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; @@ -162,7 +162,11 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile } try { //add image id of the file to the set, keeping track of images being ingested - curImageIds.add(abstractFile.getImage().getId()); + final Image fileImage = abstractFile.getImage(); + if (fileImage != null) { + //not all Content objects have an image associated (e.g. LocalFiles) + curImageIds.add(fileImage.getId()); + } } catch (TskCoreException ex) { logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex); }