You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by no...@apache.org on 2014/09/11 04:08:13 UTC

svn commit: r1624181 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java

Author: noble
Date: Thu Sep 11 02:08:13 2014
New Revision: 1624181

URL: http://svn.apache.org/r1624181
Log:
 SOLR-6499

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

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1624181&r1=1624180&r2=1624181&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Thu Sep 11 02:08:13 2014
@@ -142,7 +142,12 @@ public final class RequestHandlers {
   void initHandlersFromConfig(SolrConfig config, List<PluginInfo> implicits){
     // use link map so we iterate in the same order
     Map<PluginInfo,SolrRequestHandler> handlers = new LinkedHashMap<>();
-    ArrayList<PluginInfo> infos = new ArrayList<>(implicits);
+    Map<String, PluginInfo> implicitInfoMap= new HashMap<>();
+    //deduping implicit and explicit requesthandlers
+    for (PluginInfo info : implicits) implicitInfoMap.put(info.name,info);
+    for (PluginInfo info : config.getPluginInfos(SolrRequestHandler.class.getName()))
+      if(implicitInfoMap.containsKey(info.name)) implicitInfoMap.remove(info.name);
+    ArrayList<PluginInfo> infos = new ArrayList<>(implicitInfoMap.values());
     infos.addAll(config.getPluginInfos(SolrRequestHandler.class.getName()));
     for (PluginInfo info : infos) {
       try {