From 2eb9379aeeb08ed1e828dfe89114858e89329c97 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Tue, 9 Oct 2018 10:35:29 -0400 Subject: [PATCH] fix NPE - JIRA 1077 --- .../autopsy/imagegallery/ImageGalleryModule.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java index 544e59f421..228b3765e5 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java @@ -203,8 +203,8 @@ public class ImageGalleryModule { } } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Attempted to access ImageGallery with no case open.", ex); //NON-NLS - } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Error getting ImageGalleryController.", ex); //NON-NLS + } catch (TskCoreException ex) { + logger.log(Level.SEVERE, "Error getting ImageGalleryController.", ex); //NON-NLS } } else if (IngestManager.IngestModuleEvent.valueOf(evt.getPropertyName()) == DATA_ADDED) { @@ -212,14 +212,18 @@ public class ImageGalleryModule { if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) { DrawableDB drawableDB = controller.getDatabase(); - for (BlackboardArtifact art : mde.getArtifacts()) { - drawableDB.addExifCache(art.getObjectID()); + if (mde.getArtifacts() != null) { + for (BlackboardArtifact art : mde.getArtifacts()) { + drawableDB.addExifCache(art.getObjectID()); + } } } else if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) { DrawableDB drawableDB = controller.getDatabase(); - for (BlackboardArtifact art : mde.getArtifacts()) { - drawableDB.addHashSetCache(art.getObjectID()); + if (mde.getArtifacts() != null) { + for (BlackboardArtifact art : mde.getArtifacts()) { + drawableDB.addHashSetCache(art.getObjectID()); + } } } }