root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-08-04 15:35:16 +03:00
parent 376f13f8ef 07a1aea9c7
commit 3758e5155c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -1472,7 +1472,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
} }
TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter()); TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter());
Object result = converter.convertIfNecessary(matchingBeans.values(), resolvedArrayType); Object result = converter.convertIfNecessary(matchingBeans.values(), resolvedArrayType);
if (result instanceof Object[] array) { if (result instanceof Object[] array && array.length > 1) {
Comparator<Object> comparator = adaptDependencyComparator(matchingBeans); Comparator<Object> comparator = adaptDependencyComparator(matchingBeans);
if (comparator != null) { if (comparator != null) {
Arrays.sort(array, comparator); Arrays.sort(array, comparator);