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/06 14:29:58 UTC
tika git commit: TIKA-1932 - with correct pattern
Repository: tika
Updated Branches:
refs/heads/master 27f1b8f72 -> e2ef2e9ab
TIKA-1932 - with correct pattern
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/e2ef2e9a
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/e2ef2e9a
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/e2ef2e9a
Branch: refs/heads/master
Commit: e2ef2e9aba5783d205e428a3e607cafdb3ce102e
Parents: 27f1b8f
Author: tballison <ta...@mitre.org>
Authored: Wed Apr 6 08:29:47 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Apr 6 08:29:47 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/tika/parser/ParserDecorator.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/e2ef2e9a/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java b/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
index 213edd1..244e110 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.CloseShieldInputStream;
+import org.apache.tika.io.TemporaryResources;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
@@ -122,8 +122,10 @@ public class ParserDecorator extends AbstractParser {
throws IOException, SAXException, TikaException {
// Must have a TikaInputStream, so we can re-use it if parsing fails
// Need to close internally created tstream to release resources
+ TemporaryResources tmp = (TikaInputStream.isTikaInputStream(stream)) ? null
+ : new TemporaryResources();
try (TikaInputStream tstream =
- TikaInputStream.get(new CloseShieldInputStream(stream))) {
+ TikaInputStream.get(stream, tmp)) {
tstream.getFile();
// Try each parser in turn
for (Parser p : parsers) {
@@ -137,6 +139,10 @@ public class ParserDecorator extends AbstractParser {
// Prepare for the next parser, if present
tstream.reset();
}
+ } finally {
+ if (tmp != null) {
+ tmp.dispose();
+ }
}
}
@Override