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/11/27 14:42:32 UTC
svn commit: r1642151 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
Author: noble
Date: Thu Nov 27 13:42:32 2014
New Revision: 1642151
URL: http://svn.apache.org/r1642151
Log:
SOLR-6607 /config path should show overridden requesthandler
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1642151&r1=1642150&r2=1642151&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java Thu Nov 27 13:42:32 2014
@@ -287,7 +287,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))
@@ -732,6 +732,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)){