From 1f221aedc8d9749fabc0a88dc4b20da22590456e Mon Sep 17 00:00:00 2001
From: ming luo <itestmycode@gmail.com>
Date: Mon, 30 Oct 2023 19:35:19 -0400
Subject: [PATCH] add tlsEnabled check for non-Tls serviceUrl check

---
 .../java/org/apache/pulsar/broker/service/BrokerService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index d65df8356c3b2..f8865d6cc1005 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1386,7 +1386,7 @@ public PulsarAdmin getClusterPulsarAdmin(String cluster, Optional<ClusterData> c
                 if (isTlsEnabled && StringUtils.isEmpty(data.getServiceUrlTls())) {
                     throw new IllegalArgumentException("serviceUrlTls is empty, brokerClientTlsEnabled: "
                             + isTlsEnabled);
-                } else if (StringUtils.isEmpty(data.getServiceUrl())) {
+                } else if (!isTlsEnabled && StringUtils.isEmpty(data.getServiceUrl())) {
                     throw new IllegalArgumentException("serviceUrl is empty, brokerClientTlsEnabled: " + isTlsEnabled);
                 }
                 String adminApiUrl = isTlsEnabled ? data.getServiceUrlTls() : data.getServiceUrl();