root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-31209
pull/31230/head
Stephane Nicoll 3 years ago
parent a27427b977 dd437c4cf4
commit b2e63db57f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java
Unescape Escape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,7 +51,7 @@ class OnExpressionCondition extends SpringBootCondition {
return ConditionOutcome.noMatch(messageBuilder.because("no BeanFactory available.")); return ConditionOutcome.noMatch(messageBuilder.because("no BeanFactory available."));
} }
private Boolean evaluateExpression(ConfigurableListableBeanFactory beanFactory, String expression) { private boolean evaluateExpression(ConfigurableListableBeanFactory beanFactory, String expression) {
BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver(); BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver();
if (resolver == null) { if (resolver == null) {
resolver = new StandardBeanExpressionResolver(); resolver = new StandardBeanExpressionResolver();

Write Preview
Loading…
Cancel
Save