You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by tf...@apache.org on 2023/04/03 17:35:29 UTC
[solr] branch branch_9x updated: SOLR-16731: Use the right cluster property for determining if TLS is enabled (#1512)
This is an automated email from the ASF dual-hosted git repository.
tflobbe pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5ec82a41f0e SOLR-16731: Use the right cluster property for determining if TLS is enabled (#1512)
5ec82a41f0e is described below
commit 5ec82a41f0e268996dd3e658eb497a273929257a
Author: Tomas Eduardo Fernandez Lobbe <tf...@apache.org>
AuthorDate: Mon Apr 3 09:58:19 2023 -0700
SOLR-16731: Use the right cluster property for determining if TLS is enabled (#1512)
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/handler/admin/SystemInfoHandler.java | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index df5faa8acd6..9cc37d9f872 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -56,6 +56,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));
}