Repository: tika Updated Branches: refs/heads/master 1caa4fb6a -> bf2d40543
TIKA-1899 -- didn't add a test because triggering file was larger than the fix, metaphorically. Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/bf2d4054 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/bf2d4054 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/bf2d4054 Branch: refs/heads/master Commit: bf2d405437d5807525406e26025e12d445e00b20 Parents: 1caa4fb Author: tballison <[email protected]> Authored: Thu Mar 10 20:34:19 2016 -0500 Committer: tballison <[email protected]> Committed: Thu Mar 10 20:34:19 2016 -0500 ---------------------------------------------------------------------- .../tika/parser/image/ImageMetadataExtractor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/bf2d4054/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java index dd732f4..c73fe85 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java @@ -380,12 +380,14 @@ public class ImageMetadataExtractor { if (directory.containsTag(ExifSubIFDDirectory.TAG_FLASH)) { String flash = directory.getDescription(ExifSubIFDDirectory.TAG_FLASH); - if (flash.contains("Flash fired")) { - metadata.set(Metadata.FLASH_FIRED, Boolean.TRUE.toString()); - } else if (flash.contains("Flash did not fire")) { - metadata.set(Metadata.FLASH_FIRED, Boolean.FALSE.toString()); - } else { - metadata.set(Metadata.FLASH_FIRED, flash); + if (flash != null) { + if (flash.contains("Flash fired")) { + metadata.set(Metadata.FLASH_FIRED, Boolean.TRUE.toString()); + } else if (flash.contains("Flash did not fire")) { + metadata.set(Metadata.FLASH_FIRED, Boolean.FALSE.toString()); + } else { + metadata.set(Metadata.FLASH_FIRED, flash); + } } }
