study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
zkzlx 2019-08-20 17:59:13 +08:00
parent 9f9b5b30ed
commit 7f5c67b4ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
View File

@ -110,9 +110,9 @@ public class NacosPropertySourceBuilder {
Enumeration<String> keys = (Enumeration<String>) properties.propertyNames(); Enumeration<String> keys = (Enumeration<String>) properties.propertyNames();
while (keys.hasMoreElements()) { while (keys.hasMoreElements()) {
String key = keys.nextElement(); String key = keys.nextElement();
Object value = properties.getProperty(key); String value = properties.getProperty(key);
if (value != null) { if (value != null) {
result.put(key, ((String) value).trim()); result.put(key, value.trim());
} }
else { else {
result.put(key, null); result.put(key, null);