null check for value returned by fileTypeDetector.getFileType(AbstractFile)

This commit is contained in:
sidheshenator 2015-06-12 13:26:19 -04:00
parent 8844b5a044
commit 50394e659d

View File

@ -204,7 +204,12 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
*/ */
private boolean parsableFormat(AbstractFile f) { private boolean parsableFormat(AbstractFile f) {
try { try {
return fileTypeDetector.getFileType(f).equals("image/jpeg"); String mimeType = fileTypeDetector.getFileType(f);
if (mimeType != null) {
return fileTypeDetector.getFileType(f).equals("image/jpeg");
} else {
return false;
}
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Failed to detect file type", ex); //NON-NLS logger.log(Level.SEVERE, "Failed to detect file type", ex); //NON-NLS
return false; return false;