提交 9c871e44 编写于 作者: F funcsion 提交者: Jared Tan

fix setting null value of property in xml throws NullPointerException (#2646)

* fix setting value of property in xml is null throws NullPointerException

* fix setting null value of property in xml throws NullPointerException
上级 59d92f6b
......@@ -4,6 +4,7 @@ import com.google.common.base.Strings;
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 @@ public class PlaceholderHelper {
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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册