Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1933b648
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,发现更多精彩内容 >>
提交
1933b648
编写于
10月 14, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed @Value injection to correctly cache temporary null results for non-singleton beans (SPR-7614)
上级
5cb06f5d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
12 deletion
+44
-12
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
...tory/annotation/AutowiredAnnotationBeanPostProcessor.java
+2
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
...annotation/configuration/AutowiredConfigurationTests.java
+42
-10
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
浏览文件 @
1933b648
...
...
@@ -474,7 +474,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
value
=
beanFactory
.
resolveDependency
(
descriptor
,
beanName
,
autowiredBeanNames
,
typeConverter
);
synchronized
(
this
)
{
if
(!
this
.
cached
)
{
if
(
value
!=
null
)
{
if
(
value
!=
null
||
this
.
required
)
{
this
.
cachedFieldValue
=
descriptor
;
registerDependentBeans
(
beanName
,
autowiredBeanNames
);
if
(
autowiredBeanNames
.
size
()
==
1
)
{
...
...
@@ -545,7 +545,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
descriptors
[
i
]
=
new
DependencyDescriptor
(
methodParam
,
this
.
required
);
arguments
[
i
]
=
beanFactory
.
resolveDependency
(
descriptors
[
i
],
beanName
,
autowiredBeanNames
,
typeConverter
);
if
(
arguments
[
i
]
==
null
)
{
if
(
arguments
[
i
]
==
null
&&
!
this
.
required
)
{
arguments
=
null
;
break
;
}
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
浏览文件 @
1933b648
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
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.
...
...
@@ -18,8 +18,10 @@ package org.springframework.context.annotation.configuration;
import
static
org
.
hamcrest
.
CoreMatchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Test
;
import
test.beans.Colour
;
import
test.beans.TestBean
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -27,18 +29,17 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import
org.springframework.beans.factory.xml.XmlBeanFactory
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Scope
;
import
org.springframework.context.support.ClassPathXmlApplicationContext
;
import
org.springframework.context.support.GenericApplicationContext
;
import
org.springframework.core.io.ClassPathResource
;
import
test.beans.Colour
;
import
test.beans.TestBean
;
/**
* System tests covering use of {@link Autowired} and {@link Value} within
* {@link Configuration} classes.
*
* @author Chris Beams
* @author Juergen Hoeller
*/
public
class
AutowiredConfigurationTests
{
...
...
@@ -98,25 +99,56 @@ public class AutowiredConfigurationTests {
@Test
public
void
testValueInjection
()
{
System
.
setProperty
(
"myProp"
,
"foo"
);
ClassPathXmlApplicationContext
factory
=
new
ClassPathXmlApplicationContext
(
"ValueInjectionTests.xml"
,
AutowiredConfigurationTests
.
class
);
System
.
clearProperty
(
"myProp"
);
TestBean
testBean
=
factory
.
getBean
(
"testBean"
,
TestBean
.
class
);
assertNull
(
testBean
.
getName
());
testBean
=
factory
.
getBean
(
"testBean2"
,
TestBean
.
class
);
assertNull
(
testBean
.
getName
());
System
.
setProperty
(
"myProp"
,
"foo"
);
testBean
=
factory
.
getBean
(
"testBean"
,
TestBean
.
class
);
assertThat
(
testBean
.
getName
(),
equalTo
(
"foo"
));
testBean
=
factory
.
getBean
(
"testBean2"
,
TestBean
.
class
);
assertThat
(
testBean
.
getName
(),
equalTo
(
"foo"
));
System
.
clearProperty
(
"myProp"
);
testBean
=
factory
.
getBean
(
"testBean"
,
TestBean
.
class
);
assertNull
(
testBean
.
getName
());
testBean
=
factory
.
getBean
(
"testBean2"
,
TestBean
.
class
);
assertNull
(
testBean
.
getName
());
}
@Configuration
static
class
ValueConfig
{
@Value
(
"#{systemProperties
.myProp
}"
)
private
String
name
=
"default"
;
@Value
(
"#{systemProperties
[myProp]
}"
)
private
String
name
;
@Bean
private
String
name2
;
@Value
(
"#{systemProperties[myProp]}"
)
public
void
setName2
(
String
name
)
{
this
.
name2
=
name
;
}
@Bean
@Scope
(
"prototype"
)
public
TestBean
testBean
()
{
return
new
TestBean
(
name
);
}
@Bean
@Scope
(
"prototype"
)
public
TestBean
testBean2
()
{
return
new
TestBean
(
name2
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录