add tlsEnabled check for non-Tls serviceUrl check

datastax · Oct 30, 2023 · 1f221ae · 1f221ae
1 parent c4ff7b9
commit 1f221ae
Showing 1 changed file with 1 addition and 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
@@ -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();