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 2019/11/09 01:02:38 UTC
[tika] 02/03: TIKA-2978 -- setter for maxMainMemoryBytes should be
of type long
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit bac63e33af4a7a934654839eac64f4291692f129
Author: tallison <ta...@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 e52311b..ed72597 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
@@ -517,6 +517,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 382af86..196c5ce 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
@@ -232,7 +232,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);
}
@@ -677,10 +677,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>