You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/04/27 02:15:32 UTC

tika git commit: TIKA-1894 -- fix potential NPE in XMPMM extraction

Repository: tika
Updated Branches:
  refs/heads/master 7a543c807 -> 92a4835d0


TIKA-1894 -- fix potential NPE in XMPMM extraction


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/92a4835d
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/92a4835d
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/92a4835d

Branch: refs/heads/master
Commit: 92a4835d02d94fddbc7d70c0507b8a32345662d9
Parents: 7a543c8
Author: tballison <ta...@mitre.org>
Authored: Tue Apr 26 20:15:11 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Tue Apr 26 20:15:11 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/tika/parser/image/xmp/JempboxExtractor.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/92a4835d/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
index e62e902..0f326a8 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
@@ -131,6 +131,9 @@ public class JempboxExtractor {
      * @param metadata
      */
     public static void extractXMPMM(XMPMetadata xmp, Metadata metadata) {
+        if (xmp == null) {
+            return;
+        }
         XMPSchemaMediaManagement mmSchema = null;
         try {
             mmSchema = xmp.getMediaManagementSchema();