Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7893b3eb
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,发现更多精彩内容 >>
提交
7893b3eb
编写于
10月 13, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
applied synchronization in order to avoid race condition in skipping check (SPR-7635, SPR-7642)
上级
21d68831
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
18 deletion
+20
-18
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
...tory/annotation/AutowiredAnnotationBeanPostProcessor.java
+3
-6
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
...framework/beans/factory/annotation/InjectionMetadata.java
+17
-12
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
浏览文件 @
7893b3eb
...
...
@@ -468,7 +468,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
value
=
resolvedCachedArgument
(
beanName
,
this
.
cachedFieldValue
);
}
else
{
synchronized
(
thi
s
)
{
synchronized
(
pv
s
)
{
if
(!
this
.
cached
)
{
Set
<
String
>
autowiredBeanNames
=
new
LinkedHashSet
<
String
>(
1
);
TypeConverter
typeConverter
=
beanFactory
.
getTypeConverter
();
...
...
@@ -527,10 +527,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
@Override
protected
void
inject
(
Object
bean
,
String
beanName
,
PropertyValues
pvs
)
throws
Throwable
{
if
(
this
.
skip
==
null
)
{
this
.
skip
=
checkPropertySkipping
(
pvs
);
}
if
(
this
.
skip
)
{
if
(
checkPropertySkipping
(
pvs
))
{
return
;
}
Method
method
=
(
Method
)
this
.
member
;
...
...
@@ -541,7 +538,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
arguments
=
resolveCachedArguments
(
beanName
);
}
else
{
synchronized
(
thi
s
)
{
synchronized
(
pv
s
)
{
if
(!
this
.
cached
)
{
Class
[]
paramTypes
=
method
.
getParameterTypes
();
arguments
=
new
Object
[
paramTypes
.
length
];
...
...
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
浏览文件 @
7893b3eb
...
...
@@ -147,10 +147,7 @@ public class InjectionMetadata {
field
.
set
(
target
,
getResourceToInject
(
target
,
requestingBeanName
));
}
else
{
if
(
this
.
skip
==
null
)
{
this
.
skip
=
checkPropertySkipping
(
pvs
);
}
if
(
this
.
skip
)
{
if
(
checkPropertySkipping
(
pvs
))
{
return
;
}
try
{
...
...
@@ -170,16 +167,24 @@ public class InjectionMetadata {
* affected property as processed for other processors to ignore it.
*/
protected
boolean
checkPropertySkipping
(
PropertyValues
pvs
)
{
if
(
this
.
pd
!=
null
&&
pvs
!=
null
)
{
if
(
pvs
.
getPropertyValue
(
this
.
pd
.
getName
())
!=
null
)
{
// Explicit value provided as part of the bean definition.
return
true
;
}
else
if
(
pvs
instanceof
MutablePropertyValues
)
{
((
MutablePropertyValues
)
pvs
).
registerProcessedProperty
(
this
.
pd
.
getName
());
if
(
this
.
skip
==
null
)
{
synchronized
(
pvs
)
{
if
(
this
.
skip
==
null
)
{
if
(
this
.
pd
!=
null
&&
pvs
!=
null
)
{
if
(
pvs
.
contains
(
this
.
pd
.
getName
()))
{
// Explicit value provided as part of the bean definition.
this
.
skip
=
true
;
return
true
;
}
else
if
(
pvs
instanceof
MutablePropertyValues
)
{
((
MutablePropertyValues
)
pvs
).
registerProcessedProperty
(
this
.
pd
.
getName
());
}
}
this
.
skip
=
false
;
}
}
}
return
false
;
return
this
.
skip
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录