mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Fix possible type pollution in ConditionEvaluationReport
See gh-32916
This commit is contained in:
parent
fb954e8109
commit
34902f5a02
@ -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.
|
||||||
@ -29,7 +29,6 @@ import java.util.SortedMap;
|
|||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
import org.springframework.beans.factory.BeanFactory;
|
import org.springframework.beans.factory.BeanFactory;
|
||||||
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
|
|
||||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||||
import org.springframework.context.annotation.Condition;
|
import org.springframework.context.annotation.Condition;
|
||||||
import org.springframework.context.annotation.ConditionContext;
|
import org.springframework.context.annotation.ConditionContext;
|
||||||
@ -167,7 +166,7 @@ public final class ConditionEvaluationReport {
|
|||||||
* @return the {@link ConditionEvaluationReport} or {@code null}
|
* @return the {@link ConditionEvaluationReport} or {@code null}
|
||||||
*/
|
*/
|
||||||
public static ConditionEvaluationReport find(BeanFactory beanFactory) {
|
public static ConditionEvaluationReport find(BeanFactory beanFactory) {
|
||||||
if (beanFactory != null && beanFactory instanceof ConfigurableBeanFactory) {
|
if (beanFactory != null && beanFactory instanceof ConfigurableListableBeanFactory) {
|
||||||
return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory);
|
return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
Loading…
Reference in New Issue
Block a user