[pulsar] branch master updated: [pulsar-admin] fix NPE on admin creation (#4410)

[mm...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new cb7ec46  [pulsar-admin] fix NPE on admin creation (#4410)
cb7ec46 is described below

commit cb7ec46cb9c6d888f4d6665c3c076b84d20ca24b
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Thu May 30 14:00:57 2019 -0700

    [pulsar-admin] fix NPE on admin creation (#4410)
---
 .../src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
index 2f182f7..ce86f89 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
@@ -28,6 +28,7 @@ import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.client.admin.internal.BookiesImpl;
 import org.apache.pulsar.client.admin.internal.BrokerStatsImpl;
 import org.apache.pulsar.client.admin.internal.BrokersImpl;
@@ -155,6 +156,10 @@ public class PulsarAdmin implements Closeable {
         if (auth != null) {
             auth.start();
         }
+        
+        if (StringUtils.isBlank(clientConfigData.getServiceUrl())) {
+            clientConfigData.setServiceUrl(serviceUrl);
+        }
 
         AsyncHttpConnectorProvider asyncConnectorProvider = new AsyncHttpConnectorProvider(clientConfigData);