fix conflict
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/ef1f7b9e Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/ef1f7b9e Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/ef1f7b9e Branch: refs/heads/master Commit: ef1f7b9ec1b39d957450f3b8a11d045579068e6d Parents: 2140858 Author: tballison <[email protected]> Authored: Mon Jun 13 11:17:27 2016 -0400 Committer: tballison <[email protected]> Committed: Mon Jun 13 11:17:27 2016 -0400 ---------------------------------------------------------------------- tika-core/src/main/java/org/apache/tika/config/TikaConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/ef1f7b9e/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java index 84fd636..e76b6e6 100644 --- a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java +++ b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java @@ -564,10 +564,10 @@ public class TikaConfig { // See the thread "Configuring parsers and translators" for details } - //if the instance is configurable, then call configure() Map<String, Param<?>> params = getParams(element); //Assigning the params to bean fields/setters AnnotationUtils.assignFieldParams(loaded, params); + // Have any decoration performed, eg explicit mimetypes loaded = decorate(loaded, element); // All done with setup
