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:17:23 UTC
svn commit: r1624183 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/RequestHandlers.java solr/solrj/
Author: noble
Date: Thu Sep 11 02:17:22 2014
New Revision: 1624183
URL: http://svn.apache.org/r1624183
Log:
SOLR-6499
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1624183&r1=1624182&r2=1624183&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Sep 11 02:17:22 2014
@@ -106,6 +106,9 @@ Bug Fixes
* SOLR-6493: Fix fq exclusion via "ex" local param in multivalued stats.field (hossman)
+* SOLR-6499: Log warning about multiple update request handlers
+ (Noble Paul, Andreas Hubold, hossman)
+
Other Changes
---------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1624183&r1=1624182&r2=1624183&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Thu Sep 11 02:17:22 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 {