You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/12/01 09:33:38 UTC
svn commit: r1040893 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java
Author: jukka
Date: Wed Dec 1 08:33:37 2010
New Revision: 1040893
URL: http://svn.apache.org/viewvc?rev=1040893&view=rev
Log:
TIKA-560: Improve detection of .mht, Foxmail, and OOXML files
Allow a null InputStream in ContainerAwareDetector, as specified in the Detector contract
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java?rev=1040893&r1=1040892&r2=1040893&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/detect/ContainerAwareDetector.java Wed Dec 1 08:33:37 2010
@@ -54,12 +54,16 @@ public class ContainerAwareDetector impl
poifsDetector = new POIFSContainerDetector();
zipDetector = new ZipContainerDetector();
}
-
+
public MediaType detect(InputStream input, Metadata metadata)
throws IOException {
- return detect(TikaInputStream.get(input), metadata);
+ if (input != null) {
+ return detect(TikaInputStream.get(input), metadata);
+ } else {
+ return fallbackDetector.detect(input, metadata);
+ }
}
-
+
public MediaType detect(TikaInputStream input, Metadata metadata)
throws IOException {