Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
05a3f3ad
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,发现更多精彩内容 >>
提交
05a3f3ad
编写于
9月 06, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid failures in case of manually registered null instance (SPR-7523)
上级
b67da6c3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
0 deletion
+51
-0
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
...gframework/beans/factory/support/AbstractBeanFactory.java
+15
-0
org.springframework.context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
...ework/context/support/GenericApplicationContextTests.java
+36
-0
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
浏览文件 @
05a3f3ad
...
@@ -373,6 +373,9 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
...
@@ -373,6 +373,9 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
return
!
BeanFactoryUtils
.
isFactoryDereference
(
name
);
return
!
BeanFactoryUtils
.
isFactoryDereference
(
name
);
}
}
}
}
else
if
(
containsSingleton
(
beanName
))
{
return
true
;
}
else
{
else
{
// No singleton instance found -> check bean definition.
// No singleton instance found -> check bean definition.
...
@@ -465,6 +468,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
...
@@ -465,6 +468,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
typeToMatch
.
isAssignableFrom
(
beanInstance
.
getClass
());
typeToMatch
.
isAssignableFrom
(
beanInstance
.
getClass
());
}
}
}
}
else
if
(
containsSingleton
(
beanName
)
&&
!
containsBeanDefinition
(
beanName
))
{
// null instance registered
return
false
;
}
else
{
else
{
// No singleton instance found -> check bean definition.
// No singleton instance found -> check bean definition.
...
@@ -524,6 +531,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
...
@@ -524,6 +531,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
return
beanInstance
.
getClass
();
return
beanInstance
.
getClass
();
}
}
}
}
else
if
(
containsSingleton
(
beanName
)
&&
!
containsBeanDefinition
(
beanName
))
{
// null instance registered
return
null
;
}
else
{
else
{
// No singleton instance found -> check bean definition.
// No singleton instance found -> check bean definition.
...
@@ -860,6 +871,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
...
@@ -860,6 +871,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
if
(
beanInstance
!=
null
)
{
if
(
beanInstance
!=
null
)
{
return
(
beanInstance
instanceof
FactoryBean
);
return
(
beanInstance
instanceof
FactoryBean
);
}
}
else
if
(
containsSingleton
(
beanName
))
{
// null instance registered
return
false
;
}
// No singleton instance found -> check bean definition.
// No singleton instance found -> check bean definition.
if
(!
containsBeanDefinition
(
beanName
)
&&
getParentBeanFactory
()
instanceof
ConfigurableBeanFactory
)
{
if
(!
containsBeanDefinition
(
beanName
)
&&
getParentBeanFactory
()
instanceof
ConfigurableBeanFactory
)
{
...
...
org.springframework.context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
0 → 100644
浏览文件 @
05a3f3ad
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.context.support
;
import
org.junit.Test
;
import
org.springframework.beans.factory.support.DefaultListableBeanFactory
;
/**
* @author Juergen Hoeller
* @author Chris Beams
*/
public
class
GenericApplicationContextTests
{
@Test
public
void
nullBeanRegistration
()
{
DefaultListableBeanFactory
bf
=
new
DefaultListableBeanFactory
();
bf
.
registerSingleton
(
"nullBean"
,
null
);
new
GenericApplicationContext
(
bf
).
refresh
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录