You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/30 11:56:20 UTC
[2/4] lucene-solr:jira/solr-8668: SOLR-8668: fix != vs. == muddle
(assertWarnOrFail)
SOLR-8668: fix != vs. == muddle (assertWarnOrFail)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0cb5f640
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0cb5f640
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0cb5f640
Branch: refs/heads/jira/solr-8668
Commit: 0cb5f6404bc21ea6d637dd7ca9070f79b22f66a5
Parents: 36facea
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 12:54:34 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 12:54:34 2017 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0cb5f640/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index cdca5b0..a6bceb5 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -148,13 +148,13 @@ public class SolrIndexConfig implements MapSerializable {
mergePolicyFactoryInfo = getPluginInfo(prefix + "/mergePolicyFactory", solrConfig, def.mergePolicyFactoryInfo);
assertWarnOrFail("Beginning with Solr 7.0, <mergePolicy> is no longer supported, use <mergePolicyFactory> instead.",
- getPluginInfo(prefix + "/mergePolicy", solrConfig, null) != null,
+ getPluginInfo(prefix + "/mergePolicy", solrConfig, null) == null,
true);
assertWarnOrFail("Beginning with Solr 7.0, <maxMergeDocs> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.",
- solrConfig.getInt(prefix+"/maxMergeDocs") != 0,
+ solrConfig.getInt(prefix+"/maxMergeDocs", 0) == 0,
true);
assertWarnOrFail("Beginning with Solr 7.0, <mergeFactor> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.",
- solrConfig.getInt(prefix+"/mergeFactor") != 0,
+ solrConfig.getInt(prefix+"/mergeFactor", 0) == 0,
true);
String val = solrConfig.get(prefix + "/termIndexInterval", null);