Repository: tika Updated Branches: refs/heads/2.x 58adf80dd -> 0b795dff0
TIKA-1899 fix too small to include triggering file imho. Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/0b795dff Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/0b795dff Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/0b795dff Branch: refs/heads/2.x Commit: 0b795dff070559c2618c5654b1f1da333ea00f90 Parents: 58adf80 Author: tballison <[email protected]> Authored: Thu Mar 10 20:37:47 2016 -0500 Committer: tballison <[email protected]> Committed: Thu Mar 10 20:37:47 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/0b795dff/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java index e9ef312..e321b95 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java +++ b/tika-parser-modules/tika-parser-multimedia-module/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); + } } }
