[pulsar] branch master updated: [fix][broker] managedLedger.getConfig().getProperties().putAll(properties) NPE (#20361)

[zixuan]

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

zixuan 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 aa7decc5b75 [fix][broker] 
managedLedger.getConfig().getProperties().putAll(properties) NPE (#20361)
aa7decc5b75 is described below

commit aa7decc5b75894e864f3c5962c5cffad255abf25
Author: Heesung Sohn <103456639+heesung...@users.noreply.github.com>
AuthorDate: Sat May 20 09:34:27 2023 -0700

    [fix][broker] managedLedger.getConfig().getProperties().putAll(properties) 
NPE (#20361)
---
 .../org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index ed7cd70c641..e0f168eb8d8 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -699,7 +699,11 @@ public class PersistentTopicsBase extends AdminResource {
 
                     @Override
                     public void updatePropertiesComplete(Map<String, String> 
properties, Object ctx) {
+                        if (managedLedger.getConfig().getProperties() == null) 
{
+                            managedLedger.getConfig().setProperties(new 
HashMap<>());
+                        }
                         
managedLedger.getConfig().getProperties().putAll(properties);
+
                         future.complete(null);
                     }