From 44e2669a2f48a1526bcd3418b81feded6f634d67 Mon Sep 17 00:00:00 2001 From: zhangjidi2016 Date: Wed, 7 Jul 2021 00:01:59 +0800 Subject: [PATCH] [ISSUE #3128] fix the delete global white addresses --- .../rocketmq/acl/plain/PlainPermissionManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java index 078d34b1..a22b0b25 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java @@ -251,12 +251,6 @@ public class PlainPermissionManager { } public boolean updateGlobalWhiteAddrsConfig(List globalWhiteAddrsList) { - - if (globalWhiteAddrsList == null) { - log.error("Parameter value globalWhiteAddrsList is null,Please check your parameter"); - return false; - } - Map aclAccessConfigMap = AclUtils.getYamlDataObject(fileHome + File.separator + fileName, Map.class); if (aclAccessConfigMap == null || aclAccessConfigMap.isEmpty()) { @@ -266,9 +260,10 @@ public class PlainPermissionManager { if (globalWhiteRemoteAddrList != null) { globalWhiteRemoteAddrList.clear(); - globalWhiteRemoteAddrList.addAll(globalWhiteAddrsList); - - // Update globalWhiteRemoteAddr element in memeory map firstly + if (globalWhiteAddrsList != null) { + globalWhiteRemoteAddrList.addAll(globalWhiteAddrsList); + } + // Update globalWhiteRemoteAddr element in memory map firstly aclAccessConfigMap.put(AclConstants.CONFIG_GLOBAL_WHITE_ADDRS, globalWhiteRemoteAddrList); if (AclUtils.writeDataObject(fileHome + File.separator + fileName, updateAclConfigFileVersion(aclAccessConfigMap))) { return true; -- GitLab