Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
0288878b
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,体验更适合开发者的 AI 搜索 >>
提交
0288878b
编写于
2月 27, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent handling of early FactoryBean instantiation failures
Closes gh-22409
上级
46a39dbf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
97 addition
and
2 deletion
+97
-2
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
...s/factory/support/AbstractAutowireCapableBeanFactory.java
+18
-2
spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java
...t/annotation/AggressiveFactoryBeanInstantiationTests.java
+79
-0
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
浏览文件 @
0288878b
...
...
@@ -992,6 +992,18 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
instance
=
bw
.
getWrappedInstance
();
}
}
catch
(
UnsatisfiedDependencyException
ex
)
{
// Don't swallow, probably misconfiguration...
throw
ex
;
}
catch
(
BeanCreationException
ex
)
{
// Instantiation failure, maybe too early...
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Bean creation exception on singleton FactoryBean type check: "
+
ex
);
}
onSuppressedException
(
ex
);
return
null
;
}
finally
{
// Finished partial creation of this bean.
afterSingletonCreation
(
beanName
);
...
...
@@ -1019,7 +1031,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
return
null
;
}
Object
instance
=
null
;
Object
instance
;
try
{
// Mark this bean as currently in creation, even if just partially.
beforePrototypeCreation
(
beanName
);
...
...
@@ -1030,8 +1042,12 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
instance
=
bw
.
getWrappedInstance
();
}
}
catch
(
UnsatisfiedDependencyException
ex
)
{
// Don't swallow, probably misconfiguration...
throw
ex
;
}
catch
(
BeanCreationException
ex
)
{
//
Can only happen when getting a FactoryBean
.
//
Instantiation failure, maybe too early..
.
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Bean creation exception on non-singleton FactoryBean type check: "
+
ex
);
}
...
...
spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java
0 → 100644
浏览文件 @
0288878b
/*
* Copyright 2002-2019 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.annotation
;
import
org.junit.Test
;
import
org.springframework.beans.factory.BeanFactoryUtils
;
import
org.springframework.beans.factory.FactoryBean
;
import
org.springframework.context.ApplicationContext
;
/**
* @author Andy Wilkinson
*/
public
class
AggressiveFactoryBeanInstantiationTests
{
@Test
public
void
directlyRegisteredFactoryBean
()
{
try
(
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
())
{
context
.
register
(
SimpleFactoryBean
.
class
);
context
.
addBeanFactoryPostProcessor
((
factory
)
->
{
BeanFactoryUtils
.
beanNamesForTypeIncludingAncestors
(
factory
,
String
.
class
);
});
context
.
refresh
();
}
}
@Test
public
void
beanMethodFactoryBean
()
{
try
(
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
())
{
context
.
register
(
BeanMethodConfiguration
.
class
);
context
.
addBeanFactoryPostProcessor
((
factory
)
->
{
BeanFactoryUtils
.
beanNamesForTypeIncludingAncestors
(
factory
,
String
.
class
);
});
context
.
refresh
();
}
}
@Configuration
static
class
BeanMethodConfiguration
{
@Bean
public
SimpleFactoryBean
simpleFactoryBean
(
ApplicationContext
applicationContext
)
{
return
new
SimpleFactoryBean
(
applicationContext
);
}
}
static
class
SimpleFactoryBean
implements
FactoryBean
<
Object
>
{
public
SimpleFactoryBean
(
ApplicationContext
applicationContext
)
{
}
@Override
public
Object
getObject
()
{
return
new
Object
();
}
@Override
public
Class
<?>
getObjectType
()
{
return
Object
.
class
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录