svn commit: r782919 - /lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

[noble]

Author: noble
Date: Tue Jun  9 08:56:06 2009
New Revision: 782919

URL: http://svn.apache.org/viewvc?rev=782919&view=rev
Log:
SOLR-1198 cleanup

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=782919&r1=782918&r2=782919&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Tue Jun  9 
08:56:06 2009
@@ -817,12 +817,7 @@
   private Map<String, SearchComponent> loadSearchComponents()
   {
     Map<String, SearchComponent> components = new HashMap<String, 
SearchComponent>();
-    // there is something strange which makes the tests fail when the instance 
is created using SolrCore#createInstance
-    for (SolrConfig.PluginInfo info : solrConfig.getSearchComponentInfo()) {
-      SearchComponent sc = (SearchComponent) 
resourceLoader.newInstance(info.className);
-      sc.init(info.initArgs);
-      components.put(info.name, sc);
-    }
+    
initPlugins(solrConfig.getSearchComponentInfo(),components,SearchComponent.class);
    
     
addIfNotPresent(components,QueryComponent.COMPONENT_NAME,QueryComponent.class);
     
addIfNotPresent(components,FacetComponent.COMPONENT_NAME,FacetComponent.class);
     
addIfNotPresent(components,MoreLikeThisComponent.COMPONENT_NAME,MoreLikeThisComponent.class);