From 5f6ed1b5f72d658f80bc4f42899b04344111a30e Mon Sep 17 00:00:00 2001 From: Xiangying Meng <55571188+liangyepianzhou@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:18:38 +0800 Subject: [PATCH] [fix][broker] managedLedger.getConfig().getProperties().putAll(properties) NPE (#20361) (#5932) (cherry picked from commit aa7decc5b75894e864f3c5962c5cffad255abf25) Co-authored-by: Heesung Sohn <103456639+heesung-sn@users.noreply.github.com> --- .../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 d70b4f79d4af4..29167ac2aba04 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 @@ -697,7 +697,11 @@ private CompletableFuture internalUpdateNonPartitionedTopicProperties(Map< @Override public void updatePropertiesComplete(Map properties, Object ctx) { + if (managedLedger.getConfig().getProperties() == null) { + managedLedger.getConfig().setProperties(new HashMap<>()); + } managedLedger.getConfig().getProperties().putAll(properties); + future.complete(null); }