Browse Source

Fix possible null pointer dereference

Closes gh-4685
pull/4685/merge
mnhock 10 years ago committed by Stephane Nicoll
parent
commit
9775d40822
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java

@ -51,7 +51,8 @@ class OnExpressionCondition extends SpringBootCondition { @@ -51,7 +51,8 @@ class OnExpressionCondition extends SpringBootCondition {
// Explicitly allow environment placeholders inside the expression
expression = context.getEnvironment().resolvePlaceholders(expression);
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver();
BeanExpressionResolver resolver = (beanFactory != null)
? beanFactory.getBeanExpressionResolver() : null;
BeanExpressionContext expressionContext = (beanFactory != null)
? new BeanExpressionContext(beanFactory, null) : null;
if (resolver == null) {

Loading…
Cancel
Save