You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by yu...@apache.org on 2024/11/05 08:39:28 UTC
(pulsar) branch branch-3.0 updated: [fix] [admin] Fix lookup get a null result if uses proxy (#23556)
This is an automated email from the ASF dual-hosted git repository.
yubiao pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 2b98d2d17bc [fix] [admin] Fix lookup get a null result if uses proxy (#23556)
2b98d2d17bc is described below
commit 2b98d2d17bcb6f2f4b94b149b9bc028b52ec6d5a
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Tue Nov 5 16:36:27 2024 +0800
[fix] [admin] Fix lookup get a null result if uses proxy (#23556)
(cherry picked from commit c53a85ec909d0b760fbcdd945bee6b6929922b63)
---
.../main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
index ff7a02ca327..2482f2cc7a5 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import javax.ws.rs.client.WebTarget;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.client.admin.Lookup;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.admin.Topics;
@@ -57,7 +58,8 @@ public class LookupImpl extends BaseResource implements Lookup {
WebTarget path = v2lookup.path(prefix).path(topicName.getLookupName());
return asyncGetRequest(path, new FutureCallback<LookupData>() {})
- .thenApply(lookupData -> useTls ? lookupData.getBrokerUrlTls() : lookupData.getBrokerUrl());
+ .thenApply(lookupData -> useTls && StringUtils.isNotBlank(lookupData.getBrokerUrlTls())
+ ? lookupData.getBrokerUrlTls() : lookupData.getBrokerUrl());
}
@Override