lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r1642153 - /lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
Date Thu, 27 Nov 2014 13:46:12 GMT
Author: noble
Date: Thu Nov 27 13:46:11 2014
New Revision: 1642153

URL: http://svn.apache.org/r1642153
Log:
SOLR-6607 /config path should show overridden requesthandler

Modified:
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1642153&r1=1642152&r2=1642153&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
(original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
Thu Nov 27 13:46:11 2014
@@ -299,7 +299,7 @@ public class SolrConfig extends Config i
   }
 
   public static List<SolrPluginInfo> plugins = ImmutableList.<SolrPluginInfo>builder()
-      .add(new SolrPluginInfo(SolrRequestHandler.class, "requestHandler", REQUIRE_NAME, REQUIRE_CLASS,
MULTI_OK))
+      .add(new SolrPluginInfo(SolrRequestHandler.class, SolrRequestHandler.TYPE, REQUIRE_NAME,
REQUIRE_CLASS, MULTI_OK))
       .add(new SolrPluginInfo(QParserPlugin.class, "queryParser", REQUIRE_NAME, REQUIRE_CLASS,
MULTI_OK))
       .add(new SolrPluginInfo(QueryResponseWriter.class, "queryResponseWriter", REQUIRE_NAME,
REQUIRE_CLASS, MULTI_OK))
       .add(new SolrPluginInfo(ValueSourceParser.class, "valueSourceParser", REQUIRE_NAME,
REQUIRE_CLASS, MULTI_OK))
@@ -744,6 +744,9 @@ public class SolrConfig extends Config i
       if(plugin.options.contains(PluginOpts.REQUIRE_NAME)){
         LinkedHashMap items = new LinkedHashMap();
         for (PluginInfo info : infos) items.put(info.name, info.toMap());
+        if(tag.equals(SolrRequestHandler.TYPE)){
+          for (Map.Entry e : overlay.getReqHandlers().entrySet())  items.put(e.getKey(),e.getValue());
+        }
         result.put(tag,items);
       } else {
         if(plugin.options.contains(MULTI_OK)){



Mime
View raw message