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/06/08 17:46:37 UTC

tika git commit: TIKA-1999 small fix and update CHANGES.txt

Repository: tika
Updated Branches:
  refs/heads/master 3e1450538 -> 99aa587d1


TIKA-1999 small fix and update CHANGES.txt


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

Branch: refs/heads/master
Commit: 99aa587d171207c0c557ce65397f767d6a42cdfd
Parents: 3e14505
Author: tballison <ta...@mitre.org>
Authored: Wed Jun 8 13:46:29 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Jun 8 13:46:29 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                     | 3 +++
 .../java/org/apache/tika/parser/image/xmp/JempboxExtractor.java | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/99aa587d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 08cd8ff..0387bd6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 Release 1.14 - ???
 
+  * Add configurable maximum threshold for number of events extracted
+    from the XMP Media Management Schema in JempboxExtractor (TIKA-1999).
+
   * Integrate TesseractOCR with full page image rendering for PDFs (TIKA-1994).
 
   * Add mime detection via Nick C and parser for DBF files (TIKA-1513).

http://git-wip-us.apache.org/repos/asf/tika/blob/99aa587d/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 d9ae71d..6d5038a 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
@@ -43,14 +43,13 @@ import org.xml.sax.SAXException;
 public class JempboxExtractor {
 
 
-    private static int MAX_EVENT_HISTORY_IN_XMPMM = 1024;
+    private static volatile int MAX_EVENT_HISTORY_IN_XMPMM = 1024;
 
     // The XMP spec says it must be unicode, but for most file formats it specifies "must be encoded in UTF-8"
     private static final String DEFAULT_XMP_CHARSET = UTF_8.name();
 
     private XMPPacketScanner scanner = new XMPPacketScanner();
     private Metadata metadata;
-    private static int maxXMPMMHistory;
 
     public JempboxExtractor(Metadata metadata) {
         this.metadata = metadata;
@@ -228,6 +227,6 @@ public class JempboxExtractor {
      * @return maximum number of events to extract from the XMPMM history.
      */
     public static int getMaxXMPMMHistory() {
-        return maxXMPMMHistory;
+        return MAX_EVENT_HISTORY_IN_XMPMM;
     }
 }