[tika] branch branch_1x updated: TIKA-2725 -- first working draft...include commit with conflicts resolved. :(

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 3af35f1  TIKA-2725 -- first working draft...include commit with 
conflicts resolved. :(
3af35f1 is described below

commit 3af35f17836c1c39f420e4cbe79b24fe7bca3ede
Author: TALLISON <talli...@apache.org>
AuthorDate: Tue Sep 11 19:23:22 2018 -0400

    TIKA-2725 -- first working draft...include commit with conflicts resolved. 
:(
    
    # Conflicts:
    #   
tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java
---
 .../src/main/java/org/apache/tika/server/resource/TikaResource.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java 
b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index 450c888..a2efcc7 100644
--- 
a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ 
b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -397,7 +397,7 @@ public class TikaResource {
         checkIsOperating();
 
         long taskId = SERVER_STATUS.start(ServerStatus.TASK.PARSE,
-                metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+                metadata.get(Metadata.RESOURCE_NAME_KEY));
         try {
             parser.parse(inputStream, handler, metadata, parseContext);
         } catch (SAXException e) {