Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4685 from mnhock/master

Browse Source 
* pr/4685:
  Fix possible null pointer dereference
This commit is contained in:
Stephane Nicoll
2015-12-08 10:29:55 +01:00
parent 7b2afbdf13 9775d40822
commit 203ceffe94
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {