[dubbo] branch master updated: Avoid NPE when call AbstractDynamicConfiguration#execute (#6576)

[liujun]

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

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 56353ae  Avoid NPE when call AbstractDynamicConfiguration#execute 
(#6576)
56353ae is described below

commit 56353aebc0c678582f7a2309dfd53d29b46deb3b
Author: likemoongg <1092787...@qq.com>
AuthorDate: Fri Aug 14 17:15:27 2020 +0800

    Avoid NPE when call AbstractDynamicConfiguration#execute (#6576)
    
    fix #6575
---
 .../dubbo/common/config/configcenter/AbstractDynamicConfiguration.java  | 2 +-
 .../dubbo/common/config/configcenter/TreePathDynamicConfiguration.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
index 31c3684..0cc6af2 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
@@ -130,7 +130,7 @@ public abstract class AbstractDynamicConfiguration 
implements DynamicConfigurati
 
     @Override
     public boolean removeConfig(String key, String group) {
-        return execute(() -> doRemoveConfig(key, group), -1L);
+        return Boolean.TRUE.equals(execute(() -> doRemoveConfig(key, group), 
-1L));
     }
 
     /**
diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java
index 6ac9dd0..ad708fb 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java
@@ -87,7 +87,7 @@ public abstract class TreePathDynamicConfiguration extends 
AbstractDynamicConfig
     @Override
     public final boolean publishConfig(String key, String group, String 
content) {
         String pathKey = buildPathKey(group, key);
-        return execute(() -> doPublishConfig(pathKey, content), 
getDefaultTimeout());
+        return Boolean.TRUE.equals(execute(() -> doPublishConfig(pathKey, 
content), getDefaultTimeout()));
     }
 
     @Override