This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tika.git
commit 79d9d57cd6dfd79beedcb1fa2f517229e2bd3c84 Author: TALLISON <[email protected]> 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 1f5d8c1..b994b1e 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 @@ -389,7 +389,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) {
