Merge pull request #4198 from sleuthkit/1077_npe

fix NPE - JIRA 1077
This commit is contained in:
Brian Carrier 2018-10-09 13:00:16 -04:00 committed by GitHub
commit 330d75518a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -212,12 +212,15 @@ public class ImageGalleryModule {
if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) { if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
DrawableDB drawableDB = controller.getDatabase(); DrawableDB drawableDB = controller.getDatabase();
if (mde.getArtifacts() != null) {
for (BlackboardArtifact art : mde.getArtifacts()) { for (BlackboardArtifact art : mde.getArtifacts()) {
drawableDB.addExifCache(art.getObjectID()); drawableDB.addExifCache(art.getObjectID());
} }
} }
}
else if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) { else if (mde.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) {
DrawableDB drawableDB = controller.getDatabase(); DrawableDB drawableDB = controller.getDatabase();
if (mde.getArtifacts() != null) {
for (BlackboardArtifact art : mde.getArtifacts()) { for (BlackboardArtifact art : mde.getArtifacts()) {
drawableDB.addHashSetCache(art.getObjectID()); drawableDB.addHashSetCache(art.getObjectID());
} }
@ -225,6 +228,7 @@ public class ImageGalleryModule {
} }
} }
} }
}
/** /**
* Listener for case events. * Listener for case events.