From effe49a102e94d4473f49bdb5d29107631fd02b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Wed, 22 May 2019 18:38:18 +0800
Subject: [PATCH] NPE fix (#2732)

---
 .../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 fdc2e7fe6..f8908ea01 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);
                                 });
                             }