Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Revert "SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion"

Colvin Cowie9d6db8c900dc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9bfc1191052..e7e31b686d5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -151,8 +151,6 @@ Bug Fixes
* SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
(Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)
-* SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion (Colvin Cowie)
-
Dependency Upgrades
---------------------
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 cb750ebe132..563d817803e 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -420,9 +420,7 @@ public class SolrConfig implements MapSerializable {
pe);
}
- // The use of == is intentional here because the latest 'V.V.V' version will be equal() to
- // Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
- if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
+ if (Objects.equals(version, Version.LATEST) && !versionWarningAlreadyLogged.getAndSet(true)) {
log.warn(
"You should not use LATEST as luceneMatchVersion property: "
+ "if you use this setting, and then Solr upgrades to a newer release of Lucene, "