From a475dc261d9f5f4b5592c913c9e2945f374a7686 Mon Sep 17 00:00:00 2001 From: linjunhua Date: Thu, 24 Jun 2021 17:49:03 +0800 Subject: [PATCH 1/2] clear redundant code --- .../java/org/apache/pulsar/broker/service/BrokerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2488e070ad530..5e14e066953de 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 @@ -1048,12 +1048,12 @@ public PulsarClient getReplicationClient(String cluster) { clientBuilder.serviceUrl( isNotBlank(data.getBrokerServiceUrl()) ? data.getBrokerServiceUrl() : data.getServiceUrl()); } - if (data.getProxyProtocol() != null && StringUtils.isNotBlank(data.getProxyServiceUrl())) { + if (StringUtils.isNotBlank(data.getProxyServiceUrl())) { clientBuilder.proxyServiceUrl(data.getProxyServiceUrl(), data.getProxyProtocol()); log.info("Configuring proxy-url {} with protocol {}", data.getProxyServiceUrl(), data.getProxyProtocol()); } - if (data.getListenerName() != null && StringUtils.isNotBlank(data.getListenerName())) { + if (StringUtils.isNotBlank(data.getListenerName())) { clientBuilder.listenerName(data.getListenerName()); log.info("Configuring listenerName {}", data.getListenerName()); } From ef7d3a0ace626eac88bf4c95d05979d0200b9d24 Mon Sep 17 00:00:00 2001 From: linjunhua Date: Sat, 26 Jun 2021 11:06:02 +0800 Subject: [PATCH 2/2] fix wrong --- .../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 5e14e066953de..f086800987c73 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 @@ -1048,7 +1048,7 @@ public PulsarClient getReplicationClient(String cluster) { clientBuilder.serviceUrl( isNotBlank(data.getBrokerServiceUrl()) ? data.getBrokerServiceUrl() : data.getServiceUrl()); } - if (StringUtils.isNotBlank(data.getProxyServiceUrl())) { + if (data.getProxyProtocol() != null && StringUtils.isNotBlank(data.getProxyServiceUrl())) { clientBuilder.proxyServiceUrl(data.getProxyServiceUrl(), data.getProxyProtocol()); log.info("Configuring proxy-url {} with protocol {}", data.getProxyServiceUrl(), data.getProxyProtocol());