fix NPE when using advertisedListeners (apache#7620)

### Modifications Correct `BrokerServiceUrlTls` when `tls` is not enabled.
lujp · Jul 28, 2020 · fcb0dc0 · fcb0dc0
1 parent 4f5b39a
commit fcb0dc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...er-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java b/...er-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java
@@ -52,7 +52,7 @@ public static Map<String, AdvertisedListener> validateAndAnalysisAdvertisedListe
             throw new IllegalArgumentException("`advertisedListeners` and `advertisedAddress` must not appear together");
         }
         if (StringUtils.isBlank(config.getAdvertisedListeners())) {
-            return Collections.EMPTY_MAP;
+            return Collections.emptyMap();
         }
         Optional<String> firstListenerName = Optional.empty();
         Map<String, List<String>> listeners = Maps.newHashMap();
@@ -101,11 +101,7 @@ public static Map<String, AdvertisedListener> validateAndAnalysisAdvertisedListe
                     }
                     String hostPort = String.format("%s:%d", uri.getHost(), uri.getPort());
                     reverseMappings.computeIfAbsent(hostPort, k -> Sets.newTreeSet());
-                    Set<String> sets = reverseMappings.get(hostPort);
-                    if (sets == null) {
-                        sets = Sets.newTreeSet();
-                        reverseMappings.put(hostPort, sets);
-                    }
+                    Set<String> sets = reverseMappings.computeIfAbsent(hostPort, k -> Sets.newTreeSet());
                     sets.add(entry.getKey());
                     if (sets.size() > 1) {
                         throw new IllegalArgumentException("must not specify `" + hostPort + "` to different listener.");

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
@@ -373,8 +373,9 @@ private CompletableFuture<Optional<LookupResult>> findBrokerServiceUrl(Namespace
                             future.completeExceptionally(
                                     new PulsarServerException("the broker do not have " + options.getAdvertisedListenerName() + " listener"));
                         } else {
+                            URI urlTls = listener.getBrokerServiceUrlTls();
                             future.complete(Optional.of(new LookupResult(nsData.get(),
-                                    listener.getBrokerServiceUrl().toString(), listener.getBrokerServiceUrlTls().toString())));
+                                    listener.getBrokerServiceUrl().toString(), urlTls == null ? null : urlTls.toString())));
                         }
                         return;
                     } else {
@@ -471,8 +472,9 @@ private void searchForCandidateBroker(NamespaceBundle bundle,
                                         new PulsarServerException("the broker do not have " + options.getAdvertisedListenerName() + " listener"));
                                 return;
                             } else {
+                                URI urlTls = listener.getBrokerServiceUrlTls();
                                 lookupFuture.complete(Optional.of(new LookupResult(ownerInfo, listener.getBrokerServiceUrl().toString(),
-                                        listener.getBrokerServiceUrlTls().toString())));
+                                        urlTls == null ? null : urlTls.toString())));
                                 return;
                             }
                         } else {