fix setting null value of property in xml throws NullPointerException (…

…apolloconfig#2646) * fix setting value of property in xml is null throws NullPointerException * fix setting null value of property in xml throws NullPointerException
liqipeng · Oct 13, 2019 · 9c871e4 · 9c871e4
1 parent 59d92f6
commit 9c871e4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...lo-client/src/main/java/com/ctrip/framework/apollo/spring/property/PlaceholderHelper.java b/...lo-client/src/main/java/com/ctrip/framework/apollo/spring/property/PlaceholderHelper.java
@@ -4,6 +4,7 @@
 import com.google.common.collect.Sets;
 import java.util.Set;
 import java.util.Stack;
+import java.util.Objects;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanExpressionContext;
@@ -65,7 +66,7 @@ private Object evaluateBeanDefinitionString(ConfigurableBeanFactory beanFactory,
   public Set<String> extractPlaceholderKeys(String propertyString) {
     Set<String> placeholderKeys = Sets.newHashSet();
 
-    if (!isNormalizedPlaceholder(propertyString) && !isExpressionWithPlaceholder(propertyString)) {
+    if (Objects.isNull(propertyString) || (!isNormalizedPlaceholder(propertyString) && !isExpressionWithPlaceholder(propertyString))) {
       return placeholderKeys;
     }