[incubator-dubbo] 09/10: fix wrong reference

[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/incubator-dubbo.git

commit c20164ef1d3ef92ce8db15fc0cc27fc3c059857a
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon Dec 24 15:09:07 2018 +0800

    fix wrong reference
---
 .../src/main/java/org/apache/dubbo/config/AbstractConfig.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index a52b355..6945266 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -538,14 +538,14 @@ public abstract class AbstractConfig implements 
Serializable {
     public void refresh() {
         try {
             CompositeConfiguration compositeConfiguration = 
Environment.getInstance().getConfiguration(getPrefix(), getId());
-            InmemoryConfiguration configuration = new 
InmemoryConfiguration(getPrefix(), getId());
-            configuration.addProperties(getMetaData());
+            InmemoryConfiguration config = new 
InmemoryConfiguration(getPrefix(), getId());
+            config.addProperties(getMetaData());
             if (Environment.getInstance().isConfigCenterFirst()) {
                 // The sequence would be: SystemConfiguration -> 
ExternalConfiguration -> AppExternalConfiguration -> AbstractConfig -> 
PropertiesConfiguration
-                compositeConfiguration.addConfiguration(3,configuration);
+                compositeConfiguration.addConfiguration(3,config);
             } else {
                 // The sequence would be: SystemConfiguration -> 
AbstractConfig -> ExternalConfiguration -> AppExternalConfiguration -> 
PropertiesConfiguration
-                compositeConfiguration.addConfiguration(1, configuration);
+                compositeConfiguration.addConfiguration(1, config);
             }
 
             // loop methods, get override value and set the new value back to 
method
@@ -553,7 +553,7 @@ public abstract class AbstractConfig implements 
Serializable {
             for (Method method : methods) {
                 if (ClassHelper.isSetter(method)) {
                     try {
-                        String value = 
configuration.getString(extractPropertyName(getClass(), method));
+                        String value = 
compositeConfiguration.getString(extractPropertyName(getClass(), method));
                         // isTypeMatch() is called to avoid duplicate and 
incorrect update, for example, we have two 'setGeneric' methods in 
ReferenceConfig.
                         if (value != null && 
ClassHelper.isTypeMatch(method.getParameterTypes()[0], value)) {
                             method.invoke(this, 
ClassHelper.convertPrimitive(method.getParameterTypes()[0], value));