This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch init-bug in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 5b8d24a9a851ff41b6c2f5bd4ef7e4ef66c9949f Author: Wu Sheng <[email protected]> AuthorDate: Wed May 22 16:54:01 2019 +0800 NPE fix --- .../skywalking/oap/server/starter/config/ApplicationConfigLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java b/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java index fdc2e7f..f8908ea 100644 --- a/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java +++ b/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java @@ -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); }); }
