You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by dm...@apache.org on 2018/11/09 19:23:30 UTC
[tika] branch master updated (b899ed2 -> c95ede6)
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from b899ed2 TIKA-2777 -- improve inefficient regex performance in Optimaize in tika-eval
new 10d380a Revert: Merge pull request #247 from diffblue-assistant/finallyclosetotrywithresources
new 71e59d5 Added Closable interface to support pull request #247 from diffblue-assistant/finallyclosetotrywithresources
new c95ede6 Corrected file name to match test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/tika/fork/ForkParser.java | 4 +++-
.../java/org/apache/tika/parser/crypto/Pkcs7Parser.java | 7 +++++--
...perlink.doc => testWORD_italicsSurroundingHyperlink.doc} | Bin
3 files changed, 8 insertions(+), 3 deletions(-)
rename tika-parsers/src/test/resources/test-documents/{testWord_italicsSurroundingHyperlink.doc => testWORD_italicsSurroundingHyperlink.doc} (100%)
[tika] 01/03: Revert: Merge pull request #247 from
diffblue-assistant/finallyclosetotrywithresources
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 10d380ae6c2805b2c4889ce7fe3034a5a8f9fa1a
Author: David Meikle <da...@lingo24.com>
AuthorDate: Fri Nov 9 19:22:36 2018 +0000
Revert: Merge pull request #247 from diffblue-assistant/finallyclosetotrywithresources
---
.../src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
index 9897e4b..e84023c 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
@@ -62,8 +62,9 @@ public class Pkcs7Parser extends AbstractParser {
try {
DigestCalculatorProvider digestCalculatorProvider =
new JcaDigestCalculatorProviderBuilder().setProvider("BC").build();
- try (CMSSignedDataParser parser = new CMSSignedDataParser(digestCalculatorProvider,
- new CloseShieldInputStream(stream))) {
+ CMSSignedDataParser parser =
+ new CMSSignedDataParser(digestCalculatorProvider, new CloseShieldInputStream(stream));
+ try {
CMSTypedStream content = parser.getSignedContent();
if (content == null) {
throw new TikaException("cannot parse detached pkcs7 signature (no signed data to parse)");
@@ -73,6 +74,8 @@ public class Pkcs7Parser extends AbstractParser {
context.get(Parser.class, EmptyParser.INSTANCE);
delegate.parse(input, handler, metadata, context);
}
+ } finally {
+ parser.close();
}
} catch (OperatorCreationException e) {
throw new TikaException("Unable to create DigestCalculatorProvider", e);
[tika] 03/03: Corrected file name to match test
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit c95ede6c26313d970ad1a867bdb6ef730f90abba
Author: David Meikle <da...@lingo24.com>
AuthorDate: Fri Nov 9 19:23:21 2018 +0000
Corrected file name to match test
---
...perlink.doc => testWORD_italicsSurroundingHyperlink.doc} | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tika-parsers/src/test/resources/test-documents/testWord_italicsSurroundingHyperlink.doc b/tika-parsers/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testWord_italicsSurroundingHyperlink.doc
rename to tika-parsers/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc
[tika] 02/03: Added Closable interface to support pull request #247
from diffblue-assistant/finallyclosetotrywithresources
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 71e59d51c1bf3e4c278ef84c924e70671b49d6be
Author: David Meikle <da...@lingo24.com>
AuthorDate: Fri Nov 9 19:23:06 2018 +0000
Added Closable interface to support pull request #247 from diffblue-assistant/finallyclosetotrywithresources
---
tika-core/src/main/java/org/apache/tika/fork/ForkParser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
index 011324a..ac043e7 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
@@ -16,6 +16,7 @@
*/
package org.apache.tika.fork;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
@@ -40,7 +41,8 @@ import org.apache.tika.sax.TeeContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class ForkParser extends AbstractParser {
+public class ForkParser extends AbstractParser implements Closeable
+{
/** Serial version UID */
private static final long serialVersionUID = -4962742892274663950L;