svn commit: r1714617 - in /tika/trunk/tika-parsers/src: main/java/org/apache/tika/parser/rtf/RTFParser.java test/java/org/apache/tika/parser/rtf/RTFParserTest.java

[tallison]

Author: tallison
Date: Mon Nov 16 16:21:03 2015
New Revision: 1714617

URL: http://svn.apache.org/viewvc?rev=1714617&view=rev
Log:
TIKA-1795 RTFParser should set, not add, mime type

Modified:
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=1714617&r1=1714616&r2=1714617&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java 
(original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java 
Mon Nov 16 16:21:03 2015
@@ -78,13 +78,13 @@ public class RTFParser extends AbstractP
             InputStream stream, ContentHandler handler,
             Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
+        metadata.set(Metadata.CONTENT_TYPE, "application/rtf");
         TaggedInputStream tagged = new TaggedInputStream(stream);
         try {
             XHTMLContentHandler xhtmlHandler = new 
XHTMLContentHandler(handler, metadata);
             RTFEmbObjHandler embObjHandler = new 
RTFEmbObjHandler(xhtmlHandler, metadata, context);
             final TextExtractor ert = new TextExtractor(xhtmlHandler, 
metadata, embObjHandler);
             ert.extract(stream);
-            metadata.add(Metadata.CONTENT_TYPE, "application/rtf");
         } catch (IOException e) {
             tagged.throwIfCauseOf(e);
             throw new TikaException("Error parsing an RTF document", e);

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java?rev=1714617&r1=1714616&r2=1714617&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
 Mon Nov 16 16:21:03 2015
@@ -75,6 +75,7 @@ public class RTFParserTest extends TikaT
         String content = writer.toString();
 
         assertEquals("application/rtf", metadata.get(Metadata.CONTENT_TYPE));
+        assertEquals(1, metadata.getValues(Metadata.CONTENT_TYPE).length);
         assertContains("Test", content);
         assertContains("indexation Word", content);
     }