Skip to content

SOLR-17034: Hitting /solr// ends up with HttpSolrCall NPE #2020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
risdenk merged 1 commit into from
Oct 23, 2023
Merged

SOLR-17034: Hitting /solr// ends up with HttpSolrCall NPE #2020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
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;
Expand Down Expand Up @@ -1169,11 +1170,11 @@ private String getCoreUrl(
|| (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 match
continue;
}
if (replica.getBaseUrl().equals(cores.getZkController().getBaseUrl())) {
if (Objects.equals(replica.getBaseUrl(), cores.getZkController().getBaseUrl())) {
// don't count a local core
continue;
}
Expand Down