You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2015/08/20 23:46:28 UTC
svn commit: r1696862 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
Author: nick
Date: Thu Aug 20 21:46:28 2015
New Revision: 1696862
URL: http://svn.apache.org/r1696862
Log:
Bring in line with other parsers with special InputStream requirements, by using TikaInputStream TIKA-1710
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java?rev=1696862&r1=1696861&r2=1696862&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java Thu Aug 20 21:46:28 2015
@@ -21,11 +21,11 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.Set;
-import org.apache.commons.io.input.TaggedInputStream;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.stream.MimeConfig;
import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
@@ -44,7 +44,6 @@ import org.xml.sax.SAXException;
* @author jnioche@digitalpebble.com
*/
public class RFC822Parser extends AbstractParser {
-
/**
* Serial version UID
*/
@@ -73,13 +72,12 @@ public class RFC822Parser extends Abstra
xhtml, metadata, context, config.isStrictParsing());
parser.setContentHandler(mch);
parser.setContentDecoding(true);
- TaggedInputStream tagged = stream instanceof TaggedInputStream
- ? (TaggedInputStream)stream
- : new TaggedInputStream(stream);
+
+ TikaInputStream tstream = TikaInputStream.get(stream);
try {
- parser.parse(tagged);
+ parser.parse(tstream);
} catch (IOException e) {
- tagged.throwIfCauseOf(e);
+ tstream.throwIfCauseOf(e);
throw new TikaException("Failed to parse an email message", e);
} catch (MimeException e) {
// Unwrap the exception in case it was not thrown by mime4j