svn commit: r1469024 - /stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java

[rwesten]

Author: rwesten
Date: Wed Apr 17 18:48:56 2013
New Revision: 1469024

URL: http://svn.apache.org/r1469024
Log:
STANBOL-1045: fixes a bug where the context classloader was used instead of the 
bundle classloader

Modified:
    
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java

Modified: 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java?rev=1469024&r1=1469023&r2=1469024&view=diff
==============================================================================
--- 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
 (original)
+++ 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
 Wed Apr 17 18:48:56 2013
@@ -64,9 +64,9 @@ public abstract class AbstractAnalyzerFa
         //we need to reset the context ClassLoader to avoid leaking of Solr
         //versions present in the System (when Stanbol is running in an 
embedded
         //OSGI environment)
-        ClassLoader classLoader = 
Thread.currentThread().getContextClassLoader();
+        ClassLoader ccl = Thread.currentThread().getContextClassLoader();
         try {
-            
Thread.currentThread().setContextClassLoader(CoreContainer.class.getClassLoader());
+            Thread.currentThread().setContextClassLoader(this.classLoader);
             charFilterFactoryRegistrations = 
registerAnalyzerFactories(context, 
                 classLoader, CharFilterFactory.class);
             tokenizerFactoryRegistrations = registerAnalyzerFactories(context, 
@@ -74,7 +74,7 @@ public abstract class AbstractAnalyzerFa
             tokenFilterFactoryRegistrations = 
registerAnalyzerFactories(context, 
                 classLoader, TokenFilterFactory.class);
         } finally {
-            Thread.currentThread().setContextClassLoader(classLoader);
+            Thread.currentThread().setContextClassLoader(ccl);
         }
     }