Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16731: Use the right cluster property for determining if TLS is enabled (#1512)

Tomas Eduardo Fernandez Lobbe882be9f396d0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8df1900ed2e..c45ad3a6f6e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -92,6 +92,8 @@ Bug Fixes
* SOLR-16649: Http2SolrClient.processErrorsAndResponse uses wrong instance of ResponseParser (Andrzej Białecki)
+* SOLR-16731: Use the right cluster property for displaying if TLS is enabled (Tomás Fernández Löbbe)
+
Dependency Upgrades
---------------------
* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
index f0023791c60..327d5bbdade 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
@@ -350,9 +350,7 @@ public class SystemInfoHandler extends RequestHandlerBase {
if (cc != null && cc.getZkController() != null) {
String urlScheme =
- cc.getZkController()
- .zkStateReader
- .getClusterProperty(ZkStateReader.BASE_URL_PROP, "http");
+ cc.getZkController().zkStateReader.getClusterProperty(ZkStateReader.URL_SCHEME, "http");
info.add("tls", ZkStateReader.HTTPS.equals(urlScheme));
}