Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
5ed90468
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,发现更多精彩内容 >>
提交
5ed90468
编写于
2月 19, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
BeanMethodInterceptor does not pass on null arguments for singleton beans
Issue: SPR-13887
上级
d6700b7a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
10 deletion
+48
-10
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
...mework/context/annotation/ConfigurationClassEnhancer.java
+15
-3
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
...text/annotation/ConfigurationClassPostProcessorTests.java
+33
-7
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
浏览文件 @
5ed90468
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -364,8 +364,20 @@ class ConfigurationClassEnhancer {
if
(
alreadyInCreation
)
{
beanFactory
.
setCurrentlyInCreation
(
beanName
,
false
);
}
Object
beanInstance
=
(!
ObjectUtils
.
isEmpty
(
beanMethodArgs
)
?
beanFactory
.
getBean
(
beanName
,
beanMethodArgs
)
:
beanFactory
.
getBean
(
beanName
));
boolean
useArgs
=
!
ObjectUtils
.
isEmpty
(
beanMethodArgs
);
if
(
useArgs
&&
beanFactory
.
isSingleton
(
beanName
))
{
// Stubbed null arguments just for reference purposes,
// expecting them to be autowired for regular singleton references?
// A safe assumption since @Bean singleton arguments cannot be optional...
for
(
Object
arg
:
beanMethodArgs
)
{
if
(
arg
==
null
)
{
useArgs
=
false
;
break
;
}
}
}
Object
beanInstance
=
(
useArgs
?
beanFactory
.
getBean
(
beanName
,
beanMethodArgs
)
:
beanFactory
.
getBean
(
beanName
));
if
(
beanInstance
!=
null
&&
!
ClassUtils
.
isAssignableValue
(
beanMethod
.
getReturnType
(),
beanInstance
))
{
String
msg
=
String
.
format
(
"@Bean method %s.%s called as a bean reference "
+
"for type [%s] but overridden by non-compatible bean instance of type [%s]."
,
...
...
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
浏览文件 @
5ed90468
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -592,17 +592,23 @@ public class ConfigurationClassPostProcessorTests {
}
@Test
public
void
testPrototypeArgument
s
ThroughBeanMethodCall
()
{
public
void
testPrototypeArgumentThroughBeanMethodCall
()
{
ApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
(
BeanArgumentConfigWithPrototype
.
class
);
ctx
.
getBean
(
FooFactory
.
class
).
createFoo
(
new
BarArgument
());
}
@Test
public
void
testSingletonArgument
s
ThroughBeanMethodCall
()
{
public
void
testSingletonArgumentThroughBeanMethodCall
()
{
ApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
(
BeanArgumentConfigWithSingleton
.
class
);
ctx
.
getBean
(
FooFactory
.
class
).
createFoo
(
new
BarArgument
());
}
@Test
public
void
testNullArgumentThroughBeanMethodCall
()
{
ApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
(
BeanArgumentConfigWithNull
.
class
);
ctx
.
getBean
(
"aFoo"
);
}
// -------------------------------------------------------------------------
...
...
@@ -1137,7 +1143,7 @@ public class ConfigurationClassPostProcessorTests {
@Bean
@Scope
(
"prototype"
)
public
DependingFoo
foo
(
final
BarArgument
bar
)
{
public
DependingFoo
foo
(
BarArgument
bar
)
{
return
new
DependingFoo
(
bar
);
}
...
...
@@ -1145,7 +1151,7 @@ public class ConfigurationClassPostProcessorTests {
public
FooFactory
fooFactory
()
{
return
new
FooFactory
()
{
@Override
public
DependingFoo
createFoo
(
final
BarArgument
bar
)
{
public
DependingFoo
createFoo
(
BarArgument
bar
)
{
return
foo
(
bar
);
}
};
...
...
@@ -1156,7 +1162,7 @@ public class ConfigurationClassPostProcessorTests {
static
class
BeanArgumentConfigWithSingleton
{
@Bean
@Lazy
public
DependingFoo
foo
(
final
BarArgument
bar
)
{
public
DependingFoo
foo
(
BarArgument
bar
)
{
return
new
DependingFoo
(
bar
);
}
...
...
@@ -1164,19 +1170,39 @@ public class ConfigurationClassPostProcessorTests {
public
FooFactory
fooFactory
()
{
return
new
FooFactory
()
{
@Override
public
DependingFoo
createFoo
(
final
BarArgument
bar
)
{
public
DependingFoo
createFoo
(
BarArgument
bar
)
{
return
foo
(
bar
);
}
};
}
}
@Configuration
static
class
BeanArgumentConfigWithNull
{
@Bean
public
DependingFoo
aFoo
()
{
return
foo
(
null
);
}
@Bean
@Lazy
public
DependingFoo
foo
(
BarArgument
bar
)
{
return
new
DependingFoo
(
bar
);
}
@Bean
public
BarArgument
bar
()
{
return
new
BarArgument
();
}
}
static
class
BarArgument
{
}
static
class
DependingFoo
{
DependingFoo
(
BarArgument
bar
)
{
Assert
.
notNull
(
bar
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录