diff --git a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java index e860f290741..a1718bc7629 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java @@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -416,11 +417,11 @@ private Map request(SubscriptionGroupConfig subscriptionGroupCon private Map current(String groupName) { SubscriptionGroupConfig subscriptionGroupConfig = this.subscriptionGroupTable.get(groupName); if (subscriptionGroupConfig == null) { - return new HashMap<>(); + return Collections.emptyMap(); } else { Map attributes = subscriptionGroupConfig.getAttributes(); if (attributes == null) { - return new HashMap<>(); + return Collections.emptyMap(); } else { return attributes; } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java index 51b5f5492ad..a4325baef0a 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.broker.topic; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -750,11 +751,11 @@ private Map request(TopicConfig topicConfig) { private Map current(String topic) { TopicConfig topicConfig = getTopicConfig(topic); if (topicConfig == null) { - return new HashMap<>(); + return Collections.emptyMap(); } else { Map attributes = topicConfig.getAttributes(); if (attributes == null) { - return new HashMap<>(); + return Collections.emptyMap(); } else { return attributes; }