[skywalking] branch master updated: NPE fix (#2732)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new effe49a  NPE fix (#2732)
effe49a is described below

commit effe49a102e94d4473f49bdb5d29107631fd02b5
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed May 22 18:38:18 2019 +0800

    NPE fix (#2732)
---
 .../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);
                                 });
                             }