[dubbo] 02/04: fix parameters could be null. (#5205)

[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

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

    fix parameters could be null. (#5205)
---
 .../java/org/apache/dubbo/config/AbstractInterfaceConfig.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 3cf6cb4..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,12 +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);
-                } else {
-                    rc.setParameters(new HashMap<>());
+                    cc.getParameters().putAll(rc.getParameters());
                 }
                 
cc.getParameters().put(org.apache.dubbo.remoting.Constants.CLIENT_KEY,rc.getClient());
                 cc.setProtocol(rc.getProtocol());