[incubator-servicecomb-java-chassis] 02/02: do not duplicate copy cse config to serviceComb config when create local config

[ningjiang]

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

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 767d4a0c8ec1a0b41b2283df76abaf39dad1c089
Author: heyile <heyi...@huawei.com>
AuthorDate: Thu Jul 19 09:30:06 2018 +0800

    do not duplicate copy cse config to serviceComb config when create local 
config
---
 .../main/java/org/apache/servicecomb/config/ConfigUtil.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
 
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
index 0a0cf16..fd549b5 100644
--- 
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
+++ 
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
@@ -137,8 +137,9 @@ public final class ConfigUtil {
         .forEachOrdered(configMapEntry -> 
duplicateCseConfigToServicecomb(config,
             new ConcurrentMapConfiguration(configMapEntry.getValue()),
             configMapEntry.getKey()));
-    duplicateCseConfigToServicecomb(config,
-        new DynamicConfiguration(
+    // we have already copy the cse config to the serviceComb config when we 
load the config from local yaml files
+    // hence, we do not need duplicate copy it.
+    config.addConfiguration( new DynamicConfiguration(
             new MicroserviceConfigurationSource(configModelList), new 
NeverStartPollingScheduler()),
         "configFromYamlFile");
     duplicateCseConfigToServicecombAtFront(config,
@@ -185,11 +186,8 @@ public final class ConfigUtil {
   private static void 
duplicateCseConfigToServicecomb(ConcurrentCompositeConfiguration 
compositeConfiguration,
       AbstractConfiguration source,
       String sourceName) {
+    duplicateCseConfigToServicecomb(source);
 
-    //do not duplicate copy cse config to serviceComb config
-    if (!"configFromYamlFile".equals(sourceName)) {
-      duplicateCseConfigToServicecomb(source);
-    }
     compositeConfiguration.addConfiguration(source, sourceName);
   }