You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/04/17 09:56:54 UTC
svn commit: r1674231 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Author: alexparvulescu
Date: Fri Apr 17 07:56:53 2015
New Revision: 1674231
URL: http://svn.apache.org/r1674231
Log:
OAK-2782 Tika not able to load class in case of custom config
- merged rev 1674228
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 07:56:53 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674075,1674107
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674075,1674107,1674228
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1674231&r1=1674230&r2=1674231&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Fri Apr 17 07:56:53 2015
@@ -245,13 +245,19 @@ public class LuceneIndexEditorContext {
}
private static Parser initializeTikaParser(IndexDefinition definition) {
- if (definition.hasCustomTikaConfig()){
- InputStream is = definition.getTikaConfig();
- try {
- return new AutoDetectParser(getTikaConfig(is, definition));
- } finally {
- IOUtils.closeQuietly(is);
+ ClassLoader current = Thread.currentThread().getContextClassLoader();
+ try {
+ if (definition.hasCustomTikaConfig()) {
+ Thread.currentThread().setContextClassLoader(LuceneIndexEditorContext.class.getClassLoader());
+ InputStream is = definition.getTikaConfig();
+ try {
+ return new AutoDetectParser(getTikaConfig(is, definition));
+ } finally {
+ IOUtils.closeQuietly(is);
+ }
}
+ }finally {
+ Thread.currentThread().setContextClassLoader(current);
}
return defaultParser;
}