svn commit: r1709350 - in /tika/trunk: CHANGES.txt tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java

[mattmann]

Author: mattmann
Date: Mon Oct 19 05:29:27 2015
New Revision: 1709350

URL: http://svn.apache.org/viewvc?rev=1709350&view=rev
Log:
Fix for TIKA-1746: modify TikaFileTypeDetector to use new detect method 
accepting java.nio.file.Path contributed by Yaniv Kunda.

Modified:
    tika/trunk/CHANGES.txt
    
tika/trunk/tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java

Modified: tika/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1709350&r1=1709349&r2=1709350&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Mon Oct 19 05:29:27 2015
@@ -1,7 +1,8 @@
 Release 1.11 - Current Development
 
   * Java7 API support for allowing java.nio.file.Path as method arguments
-    was added to Tika and to ParsingReader (TIKA-1745).
+    was added to Tika and to ParsingReader, TikaFileTypeDetector 
+    (TIKA-1745, TIKA-1746).
 
   * MIME support was added for WebVTT: The Web Video Text Tracks Format
     files (TIKA-1772).

Modified: 
tika/trunk/tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java?rev=1709350&r1=1709349&r2=1709350&view=diff
==============================================================================
--- 
tika/trunk/tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java
 (original)
+++ 
tika/trunk/tika-java7/src/main/java/org/apache/tika/filetypedetector/TikaFileTypeDetector.java
 Mon Oct 19 05:29:27 2015
@@ -18,7 +18,6 @@
 package org.apache.tika.filetypedetector;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.spi.FileTypeDetector;
 
@@ -41,7 +40,7 @@ public class TikaFileTypeDetector extend
         }
         
         // Then check the file content if necessary
-        String fileContentDetect = tika.detect(path.toFile());
+        String fileContentDetect = tika.detect(path);
         if(!fileContentDetect.equals(MimeTypes.OCTET_STREAM)) {
             return fileContentDetect;
         }