kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NPE fix (#2732)

This commit is contained in:
吴晟 Wu Sheng 2019-05-22 18:38:18 +08:00 committed by GitHub
parent 202918cbea
commit effe49a102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java
View File

@ -69,7 +69,9 @@ public class ApplicationConfigLoader implements ConfigLoader<ApplicationConfigur
properties.put(key, value);
final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE
.replacePlaceholders(value + "", properties));
properties.replace(key, replaceValue);
if (replaceValue != null) {
properties.replace(key, replaceValue);
}
logger.info("The property with key: {}, value: {}, in {} provider", key, replaceValue.toString(), name);
});
}