You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xy...@apache.org on 2022/02/17 03:58:22 UTC
[pulsar] branch branch-2.9 updated: [issue-14304] Check for blank advertised listener name (#14306)
This is an automated email from the ASF dual-hosted git repository.
xyz pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 1e429b5 [issue-14304] Check for blank advertised listener name (#14306)
1e429b5 is described below
commit 1e429b5f1311374d3a27d822bfc26c5aa25cacef
Author: Eron Wright <ew...@streamnative.io>
AuthorDate: Tue Feb 15 23:02:46 2022 -0800
[issue-14304] Check for blank advertised listener name (#14306)
Fixes #14304
### Modifications
- [ServerCnx] check for blank advertised listener name
- [ServerCnx] improved logging
(cherry picked from commit 422efbb0528f54aab92d33732747b454016727aa)
---
.../src/main/java/org/apache/pulsar/broker/service/ServerCnx.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 189c079..beb713c 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -417,10 +417,12 @@ public class ServerCnx extends PulsarHandler implements TransportCnx {
final boolean authoritative = lookup.isAuthoritative();
// use the connection-specific listener name by default.
- final String advertisedListenerName = lookup.hasAdvertisedListenerName() ? lookup.getAdvertisedListenerName()
- : this.listenerName;
+ final String advertisedListenerName =
+ lookup.hasAdvertisedListenerName() && StringUtils.isNotBlank(lookup.getAdvertisedListenerName())
+ ? lookup.getAdvertisedListenerName() : this.listenerName;
if (log.isDebugEnabled()) {
- log.debug("[{}] Received Lookup from {} for {}", lookup.getTopic(), remoteAddress, requestId);
+ log.debug("[{}] Received Lookup from {} for {} requesting listener {}", lookup.getTopic(), remoteAddress,
+ requestId, StringUtils.isNotBlank(advertisedListenerName) ? advertisedListenerName : "(none)");
}
TopicName topicName = validateTopicName(lookup.getTopic(), requestId, lookup);