[incubator-dubbo] branch master updated: Update AbstractConfig.java (#3737)

[huxing]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new fb0fd60  Update AbstractConfig.java (#3737)
fb0fd60 is described below

commit fb0fd60fab7c62d8975fc7ac6bde93cb6bb2e6e2
Author: 鲁班学院-周瑜老师 <497269...@qq.com>
AuthorDate: Tue Mar 26 22:59:32 2019 +0800

    Update AbstractConfig.java (#3737)
    
    配置中心的覆盖注释错误，APP优先于全局配置
---
 .../src/main/java/org/apache/dubbo/config/AbstractConfig.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a40bfc3..61d05c5 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
@@ -545,10 +545,10 @@ public abstract class AbstractConfig implements 
Serializable {
             InmemoryConfiguration config = new 
InmemoryConfiguration(getPrefix(), getId());
             config.addProperties(getMetaData());
             if (Environment.getInstance().isConfigCenterFirst()) {
-                // The sequence would be: SystemConfiguration -> 
ExternalConfiguration -> AppExternalConfiguration -> AbstractConfig -> 
PropertiesConfiguration
+                // The sequence would be: SystemConfiguration -> 
AppExternalConfiguration -> ExternalConfiguration -> AbstractConfig -> 
PropertiesConfiguration
                 compositeConfiguration.addConfiguration(3, config);
             } else {
-                // The sequence would be: SystemConfiguration -> 
AbstractConfig -> ExternalConfiguration -> AppExternalConfiguration -> 
PropertiesConfiguration
+                // The sequence would be: SystemConfiguration -> 
AbstractConfig -> AppExternalConfiguration -> ExternalConfiguration -> 
PropertiesConfiguration
                 compositeConfiguration.addConfiguration(1, config);
             }