Author: amitj
Date: Wed Jun 24 07:46:10 2015
New Revision: 1687182
URL: http://svn.apache.org/r1687182
Log:
OAK-3027: NullPointerException from Tika if SupportedMediaType is null in
LuceneIndexEditorContext
Passing empty ParseContext object to parser.getSupportedTypes()
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1687182&r1=1687181&r2=1687182&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Wed Jun 24 07:46:10 2015
@@ -51,6 +51,7 @@ import org.apache.lucene.store.FSDirecto
import org.apache.tika.config.TikaConfig;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -256,7 +257,7 @@ public class LuceneIndexEditorContext {
public boolean isSupportedMediaType(String type) {
if (supportedMediaTypes == null) {
- supportedMediaTypes = getParser().getSupportedTypes(null);
+ supportedMediaTypes = getParser().getSupportedTypes(new
ParseContext());
}
return supportedMediaTypes.contains(MediaType.parse(type));
}