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

fixed empty config

Browse Source
This commit is contained in:
jianghang.loujh
2025-08-06 10:18:37 +08:00
parent 9f2fc7409f
commit af9375440d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/support/PropertyPlaceholderConfigurer.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware; import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
@@ -126,20 +127,20 @@ public class PropertyPlaceholderConfigurer extends org.springframework.beans.fac
} }
// 以threadlocal的为准覆盖file properties // 以threadlocal的为准覆盖file properties
if (propVal == null) { if (StringUtils.isBlank(propVal)) {
Properties localProperties = propertiesLocal.get(); Properties localProperties = propertiesLocal.get();
propVal = resolvePlaceholder(dp.placeholder, localProperties); propVal = resolvePlaceholder(dp.placeholder, localProperties);
} }
if (propVal == null) { if (StringUtils.isBlank(propVal)) {
propVal = resolvePlaceholder(dp.placeholder, props); propVal = resolvePlaceholder(dp.placeholder, props);
} }
if (propVal == null && systemPropertiesMode == SYSTEM_PROPERTIES_MODE_FALLBACK) { if (StringUtils.isBlank(propVal) && systemPropertiesMode == SYSTEM_PROPERTIES_MODE_FALLBACK) {
propVal = resolveSystemProperty(dp.placeholder); propVal = resolveSystemProperty(dp.placeholder);
} }
if (propVal == null) { if (StringUtils.isBlank(propVal)) {
propVal = dp.defaultValue; propVal = dp.defaultValue;
} }