Skip to content

Commit 1b409d5

Browse files
perlunsnicoll
authored andcommitted
Make sure NoUniqueBeanDefinitionException to be serializable
See gh-29753
1 parent ca14202 commit 1b409d5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.Serializable;
2222
import java.lang.annotation.Annotation;
2323
import java.lang.reflect.Field;
24+
import java.util.HashSet;
2425
import java.util.Map;
2526
import java.util.Optional;
2627

@@ -215,7 +216,7 @@ public boolean isEager() {
215216
*/
216217
@Nullable
217218
public Object resolveNotUnique(ResolvableType type, Map<String, Object> matchingBeans) throws BeansException {
218-
throw new NoUniqueBeanDefinitionException(type, matchingBeans.keySet());
219+
throw new NoUniqueBeanDefinitionException(type, new HashSet<>( matchingBeans.keySet() ));
219220
}
220221

221222
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.Arrays;
3131
import java.util.Collection;
3232
import java.util.Comparator;
33+
import java.util.HashSet;
3334
import java.util.IdentityHashMap;
3435
import java.util.Iterator;
3536
import java.util.LinkedHashSet;
@@ -1296,7 +1297,7 @@ else if (candidateNames.length > 1) {
12961297
return new NamedBeanHolder<>(candidateName, (T) beanInstance);
12971298
}
12981299
if (!nonUniqueAsNull) {
1299-
throw new NoUniqueBeanDefinitionException(requiredType, candidates.keySet());
1300+
throw new NoUniqueBeanDefinitionException(requiredType, new HashSet<>(candidates.keySet()));
13001301
}
13011302
}
13021303

0 commit comments

Comments
 (0)