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 ea6c0091fe4e03f3a5af34dd17e2288940c5ae7e Author: TALLISON <[email protected]> AuthorDate: Tue Sep 18 13:53:38 2018 -0400 fix conflict --- .../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 b994b1e..1f5d8c1 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(Metadata.RESOURCE_NAME_KEY)); + metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY)); try { parser.parse(inputStream, handler, metadata, parseContext); } catch (SAXException e) {
