svn commit: r1754015 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java

[chetanm]

Author: chetanm
Date: Mon Jul 25 14:22:08 2016
New Revision: 1754015

URL: http://svn.apache.org/viewvc?rev=1754015&view=rev
Log:
OAK-4595 - OSGiIT failure LuceneIndexProviderService exception

Move the initialization logic such that it gets invoked post change of Thread 
Context Classloader

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1754015&r1=1754014&r2=1754015&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
 Mon Jul 25 14:22:08 2016
@@ -227,7 +227,7 @@ public class LuceneIndexProviderService
 
         configureBooleanClauseLimit(config);
         initializeFactoryClassLoaders(getClass().getClassLoader());
-        initializeClasses();
+
         whiteboard = new OsgiWhiteboard(bundleContext);
         threadPoolSize = 
PropertiesUtil.toInteger(config.get(PROP_THREAD_POOL_SIZE), 
PROP_THREAD_POOL_SIZE_DEFAULT);
         initializeExtractedTextCache(bundleContext, config);
@@ -429,6 +429,7 @@ public class LuceneIndexProviderService
             //so switch the TCCL so that static initializer picks up the right
             //classloader
             initializeFactoryClassLoaders0(classLoader);
+            initializeClasses();
         } catch (Throwable t) {
             log.warn("Error occurred while initializing the Lucene " +
                     "Factories", t);