Apache Solr open-source search software
SOLR-17034: Hitting /solr// ends up with HttpSolrCall NPE when using Solr Cloud (#2020)
Kevin Risden68ecfaf84a83
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.javaindex ce9b1f8e6be..a4d647fec0a 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java@@ -49,6 +49,7 @@ import java.util.LinkedHashSet;import java.util.List;import java.util.Locale;import java.util.Map;+import java.util.Objects;import java.util.Random;import java.util.Set;import java.util.concurrent.TimeUnit;@@ -1169,11 +1170,11 @@ public class HttpSolrCall {|| (liveNodes.contains(replica.getNodeName())&& replica.getState() == Replica.State.ACTIVE)) {- if (byCoreName && !origCorename.equals(replica.getStr(CORE_NAME_PROP))) {+ if (byCoreName && !Objects.equals(origCorename, replica.getStr(CORE_NAME_PROP))) {// if it's by core name, make sure they matchcontinue;}- if (replica.getBaseUrl().equals(cores.getZkController().getBaseUrl())) {+ if (Objects.equals(replica.getBaseUrl(), cores.getZkController().getBaseUrl())) {// don't count a local corecontinue;}