[tika] branch branch_1x updated: TIKA-2978 -- setter for maxMainMemoryBytes should be of type long

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 770719a  TIKA-2978 -- setter for maxMainMemoryBytes should be of type 
long
     new e6adbc8  Merge remote-tracking branch 'origin/branch_1x' into branch_1x
770719a is described below

commit 770719a07f57d4804383f262fa8cccc8ec172fc0
Author: tallison <talli...@apache.org>
AuthorDate: Fri Nov 8 13:53:09 2019 -0500

    TIKA-2978 -- setter for maxMainMemoryBytes should be of type long
---
 .../src/main/java/org/apache/tika/parser/pdf/PDFParser.java   |  4 ++++
 .../main/java/org/apache/tika/parser/pdf/PDFParserConfig.java | 11 ++++++++++-
 .../org/apache/tika/parser/pdf/tika-inline-config.xml         |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java 
b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
index 7af13db..b6ee44c 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
@@ -529,6 +529,10 @@ public class PDFParser extends AbstractParser implements 
Initializable {
         this.initializableProblemHandler = initializableProblemHandler;
     }
 
+    @Field
+    public void setMaxMainMemoryBytes(long maxMainMemoryBytes) {
+        defaultConfig.setMaxMainMemoryBytes(maxMainMemoryBytes);
+    }
     /**
      * This is a no-op.  There is no need to initialize multiple fields.
      * The regular field loading should happen without this.
diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java 
b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
index aafc176..7f4a751 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
@@ -238,7 +238,7 @@ public class PDFParserConfig implements Serializable {
             accessChecker = new AccessChecker(allowExtractionForAccessibility);
         }
 
-        maxMainMemoryBytes = 
getIntProp(props.getProperty("maxMainMemoryBytes"), -1);
+        maxMainMemoryBytes = 
getLongProp(props.getProperty("maxMainMemoryBytes"), -1);
         detectAngles = getBooleanProp(props.getProperty("detectAngles"), 
false);
     }
 
@@ -701,10 +701,19 @@ public class PDFParserConfig implements Serializable {
         return maxMainMemoryBytes;
     }
 
+    /**
+     * @deprecated use {@link #setMaxMainMemoryBytes(long)}
+     * @param maxMainMemoryBytes
+     */
+    @Deprecated
     public void setMaxMainMemoryBytes(int maxMainMemoryBytes) {
         this.maxMainMemoryBytes = maxMainMemoryBytes;
     }
 
+    public void setMaxMainMemoryBytes(long maxMainMemoryBytes) {
+        this.maxMainMemoryBytes = maxMainMemoryBytes;
+    }
+
     /**
      * <p>
      *     Whether to call <code>System.setProperty("sun.java2d.cmm", 
"sun.java2d.cmm.kcms.KcmsServiceProvider")</code>.
diff --git 
a/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
 
b/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
index d0bf627..5ba36dc 100644
--- 
a/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
+++ 
b/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
@@ -31,7 +31,7 @@
                 <param name="ocrImageQuality" type="float">2.1</param>
                 <param name="ocrImageFormatName" type="string">jpeg</param>
                 <param name="ocrImageScale" type="float">1.3</param>
-                <param name="maxMainMemoryBytes" type="int">524288000</param>
+                <param name="maxMainMemoryBytes" type="long">524288000</param>
                 <!-- we really should throw an exception for this!! -->
                 <param name="someRandomThingOrOther" type="bool">true</param>
             </params>