chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决rdb下有多个配制，会导致配置相互覆盖的问题 (#4560)

Browse Source 
恩baseProperties这个变量是共享的，不能修改这个变量的属性值。要不后续的配置都会改变。关联issue为4355
This commit is contained in:
weirhp
2023-09-04 17:23:26 +08:00
committed by GitHub
parent 5ea9259f0d
commit d623bea71a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java
View File

@@ -73,6 +73,9 @@ public class YamlUtils {
PropertySource<?> propertySource = propertySources.get(0); PropertySource<?> propertySource = propertySources.get(0);
Properties properties = new Properties(); Properties properties = new Properties();
if (baseProperties != null) {
properties.putAll(baseProperties);
}
properties.putAll((Map<?, ?>) propertySource.getSource()); properties.putAll((Map<?, ?>) propertySource.getSource());
@@ -83,11 +86,6 @@ public class YamlUtils {
} }
} }
if (baseProperties != null) {
baseProperties.putAll(properties);
properties = baseProperties;
}
ConfigurationPropertySource sources = new MapConfigurationPropertySource(properties); ConfigurationPropertySource sources = new MapConfigurationPropertySource(properties);
Binder binder = new Binder(sources); Binder binder = new Binder(sources);
return binder.bind(prefix, Bindable.of(clazz)).get(); return binder.bind(prefix, Bindable.of(clazz)).get();