lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject [lucene-solr] branch jira/SOLR-13659 updated: SOLR-13659: initial commit
Date Tue, 30 Jul 2019 19:30:27 GMT
This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/SOLR-13659
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/SOLR-13659 by this push:
     new 0f0a7cd  SOLR-13659: initial commit
0f0a7cd is described below

commit 0f0a7cd84523b2518dadfe986385f19ce00a3876
Author: noble <noble@apache.org>
AuthorDate: Wed Jul 31 05:30:09 2019 +1000

    SOLR-13659: initial commit
---
 solr/core/src/java/org/apache/solr/core/SolrConfig.java    | 2 +-
 solr/core/src/java/org/apache/solr/search/CacheConfig.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 41d42745..baeeb39 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -294,7 +294,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable
{
     slowQueryThresholdMillis = getInt("query/slowQueryThresholdMillis", -1);
     for (SolrPluginInfo plugin : plugins) loadPluginInfo(plugin);
 
-    Map<String, CacheConfig> userCacheConfigs = CacheConfig.getConfig(this, "query/cache",true);
+    Map<String, CacheConfig> userCacheConfigs = CacheConfig.getConfigs(this, "query/cache");
     List<PluginInfo> caches = getPluginInfos(SolrCache.class.getName());
     if (!caches.isEmpty()) {
       for (PluginInfo c : caches) {
diff --git a/solr/core/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
index 71cbe2d..f0d031c 100644
--- a/solr/core/src/java/org/apache/solr/search/CacheConfig.java
+++ b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
@@ -83,7 +83,7 @@ public class CacheConfig implements MapWriter {
     return args;
   }
 
-  public static Map<String, CacheConfig> getConfig(SolrConfig solrConfig, String configPath,
boolean multiple) {
+  public static Map<String, CacheConfig> getConfigs(SolrConfig solrConfig, String configPath)
{
     NodeList nodes = (NodeList) solrConfig.evaluate(configPath, XPathConstants.NODESET);
     if (nodes == null || nodes.getLength() == 0) return new LinkedHashMap<>();
     Map<String, CacheConfig> result = new HashMap<>(nodes.getLength());


Mime
View raw message