[pulsar] branch branch-2.10 updated: Fixed merge issue for a098cc1ab

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new d69fc53  Fixed merge issue for a098cc1ab
d69fc53 is described below

commit d69fc537ff9b7e28c1378e6bffbdea472e077b42
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Mon Mar 28 15:16:57 2022 -0700

    Fixed merge issue for a098cc1ab
---
 pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java 
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
index ded8add..aaafd65 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
@@ -301,7 +301,7 @@ public class PulsarStandalone implements AutoCloseable {
         broker.start();
 
         final String cluster = config.getClusterName();
-        final AdvertisedListener internalListener = 
ServiceConfigurationUtils.getInternalListener(config);
+        final AdvertisedListener internalListener = 
ServiceConfigurationUtils.getInternalListener(config, "pulsar");
         if (!config.isTlsEnabled()) {
             checkArgument(config.getWebServicePort().isPresent(), 
"webServicePort must be present");
             checkArgument(internalListener.getBrokerServiceUrl() != null,