From 9775d40822c8b1e43d480f13ff1bf231cd0c0eb6 Mon Sep 17 00:00:00 2001 From: mnhock Date: Sat, 5 Dec 2015 21:30:23 +0100 Subject: [PATCH] Fix possible null pointer dereference Closes gh-4685 --- .../boot/autoconfigure/condition/OnExpressionCondition.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java index 09c302bfda2..f4b4d2cf9d2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java @@ -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) {