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 daec8dbe6024938ec51a42840f09bb4050c6e3f4 Author: TALLISON <[email protected]> AuthorDate: Tue Sep 18 13:09:13 2018 -0400 TIKA-2725 -- fix merge conflicts --- .../src/main/java/org/apache/tika/server/resource/DetectorResource.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java index 96b6f91..6414796 100644 --- a/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java +++ b/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java @@ -55,6 +55,7 @@ public class DetectorResource { .getRequestHeaders()); LOG.info("Detecting media type for Filename: {}", filename); met.add(TikaCoreProperties.RESOURCE_NAME_KEY, filename); + long taskId = serverStatus.start(ServerStatus.TASK.DETECT, filename); try { return TikaResource.getConfig().getDetector().detect(tis, met).toString(); } catch (IOException e) {
