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

[yubiao]

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

commit 4cee3c3e987b04211f8e5c4495b9cb3a8bdfd4a6
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)
    
    (cherry picked from commit aa7decc5b75894e864f3c5962c5cffad255abf25)
---
 .../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 de75c5f2132..5cd6ff8cbd9 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);
                     }