You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2021/02/08 18:43:23 UTC
svn commit: r1886332 - in /jackrabbit/branches/2.14: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
Author: reschke
Date: Mon Feb 8 18:43:23 2021
New Revision: 1886332
URL: http://svn.apache.org/viewvc?rev=1886332&view=rev
Log:
JCR-4551: Use the normalized MediaType to check if the given MediaType should be indexed (merged r1876287 into 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1876287
Modified: jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=1886332&r1=1886331&r2=1886332&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Mon Feb 8 18:43:23 2021
@@ -47,6 +47,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.FieldInfo;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.mime.MediaTypeRegistry;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.slf4j.Logger;
@@ -934,7 +935,7 @@ public class NodeIndexer {
if (supportedMediaTypes == null) {
supportedMediaTypes = parser.getSupportedTypes(new ParseContext());
}
- return supportedMediaTypes.contains(MediaType.parse(type));
+ return supportedMediaTypes.contains(MediaTypeRegistry.getDefaultRegistry().normalize(MediaType.parse(type)));
}
/**