Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NoUniqueBeanDefinitionException should make sure beansNameFound is serializable #29753

Closed
wants to merge 1 commit into from
Closed

NoUniqueBeanDefinitionException should make sure beansNameFound is serializable #29753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ng-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;

Expand Down Expand Up @@ -215,7 +216,7 @@ public boolean isEager() {
*/
@Nullable
public Object resolveNotUnique(ResolvableType type, Map<String, Object> matchingBeans) throws BeansException {
throw new NoUniqueBeanDefinitionException(type, matchingBeans.keySet());
throw new NoUniqueBeanDefinitionException(type, new HashSet<>( matchingBeans.keySet() ));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -1284,7 +1285,7 @@ else if (candidateNames.length > 1) {
return new NamedBeanHolder<>(candidateName, (T) beanInstance);
}
if (!nonUniqueAsNull) {
throw new NoUniqueBeanDefinitionException(requiredType, candidates.keySet());
throw new NoUniqueBeanDefinitionException(requiredType, new HashSet<>(candidates.keySet()));
}
}

Expand Down