WillemJiang closed pull request #819: [SCB-755] 755 Duplicate copy cse config
to Servicecomb config
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/819
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 21f22426d..284139875 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 static ConcurrentCompositeConfiguration
createLocalConfig(List<ConfigMode
.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,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
