[dubbo] branch 2.7.4-release updated: fix parameters could be null. (#5205)

[victory]

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

victory pushed a commit to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.4-release by this push:
     new 1462b50  fix parameters could be null. (#5205)
1462b50 is described below

commit 1462b50509330aaf3904932bca9b696080c72b3c
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon Oct 21 17:02:05 2019 +0800

    fix parameters could be null. (#5205)
---
 .../main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 9e3952c..50e406e 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -620,10 +620,11 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
             Environment.getInstance().getDynamicConfiguration().orElseGet(() 
-> {
                 ConfigManager configManager = ConfigManager.getInstance();
                 ConfigCenterConfig cc = 
configManager.getConfigCenter().orElse(new ConfigCenterConfig());
+                if (cc.getParameters() == null) {
+                    cc.setParameters(new HashMap<>());
+                }
                 if (rc.getParameters() != null) {
-                    Map<String, String> configParams = cc.getParameters() == 
null ? new HashMap<>() : cc.getParameters();
-                    configParams.putAll(rc.getParameters());
-                    cc.setParameters(configParams);
+                    cc.getParameters().putAll(rc.getParameters());
                 }
                 
cc.getParameters().put(org.apache.dubbo.remoting.Constants.CLIENT_KEY,rc.getClient());
                 cc.setProtocol(rc.getProtocol());