Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
77d72f1e
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
77d72f1e
编写于
7月 16, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Injected Map/Collection does not include null bean entries
Issue: SPR-17034
上级
faef363e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
6 deletion
+11
-6
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
...ork/beans/factory/support/DefaultListableBeanFactory.java
+7
-1
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
...annotation/AutowiredAnnotationBeanPostProcessorTests.java
+4
-5
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
浏览文件 @
77d72f1e
...
...
@@ -1318,7 +1318,13 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
private
void
addCandidateEntry
(
Map
<
String
,
Object
>
candidates
,
String
candidateName
,
DependencyDescriptor
descriptor
,
Class
<?>
requiredType
)
{
if
(
descriptor
instanceof
MultiElementDescriptor
||
containsSingleton
(
candidateName
))
{
if
(
descriptor
instanceof
MultiElementDescriptor
)
{
Object
beanInstance
=
descriptor
.
resolveCandidate
(
candidateName
,
requiredType
,
this
);
if
(!(
beanInstance
instanceof
NullBean
))
{
candidates
.
put
(
candidateName
,
beanInstance
);
}
}
else
if
(
containsSingleton
(
candidateName
))
{
Object
beanInstance
=
descriptor
.
resolveCandidate
(
candidateName
,
requiredType
,
this
);
candidates
.
put
(
candidateName
,
(
beanInstance
instanceof
NullBean
?
null
:
beanInstance
));
}
...
...
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
浏览文件 @
77d72f1e
...
...
@@ -728,9 +728,8 @@ public class AutowiredAnnotationBeanPostProcessorTests {
ConstructorsCollectionResourceInjectionBean
bean
=
(
ConstructorsCollectionResourceInjectionBean
)
bf
.
getBean
(
"annotatedBean"
);
assertNull
(
bean
.
getTestBean3
());
assertSame
(
tb
,
bean
.
getTestBean4
());
assertEquals
(
2
,
bean
.
getNestedTestBeans
().
size
());
assertNull
(
bean
.
getNestedTestBeans
().
get
(
0
));
assertSame
(
ntb2
,
bean
.
getNestedTestBeans
().
get
(
1
));
assertEquals
(
1
,
bean
.
getNestedTestBeans
().
size
());
assertSame
(
ntb2
,
bean
.
getNestedTestBeans
().
get
(
0
));
Map
<
String
,
NestedTestBean
>
map
=
bf
.
getBeansOfType
(
NestedTestBean
.
class
);
assertNull
(
map
.
get
(
"nestedTestBean1"
));
...
...
@@ -924,12 +923,12 @@ public class AutowiredAnnotationBeanPostProcessorTests {
bf
.
registerBeanDefinition
(
"testBean2"
,
tb2
);
MapConstructorInjectionBean
bean
=
(
MapConstructorInjectionBean
)
bf
.
getBean
(
"annotatedBean"
);
assertEquals
(
2
,
bean
.
getTestBeanMap
().
size
());
assertEquals
(
1
,
bean
.
getTestBeanMap
().
size
());
assertSame
(
tb1
,
bean
.
getTestBeanMap
().
get
(
"testBean1"
));
assertNull
(
bean
.
getTestBeanMap
().
get
(
"testBean2"
));
bean
=
(
MapConstructorInjectionBean
)
bf
.
getBean
(
"annotatedBean"
);
assertEquals
(
2
,
bean
.
getTestBeanMap
().
size
());
assertEquals
(
1
,
bean
.
getTestBeanMap
().
size
());
assertSame
(
tb1
,
bean
.
getTestBeanMap
().
get
(
"testBean1"
));
assertNull
(
bean
.
getTestBeanMap
().
get
(
"testBean2"
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录