Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
8b5d3559
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,发现更多精彩内容 >>
提交
8b5d3559
编写于
8月 11, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid stack overflow in case of chained factory-bean references to FactoryBean class
Issue: SPR-14551
上级
6157fad9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
11 deletion
+23
-11
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
...s/factory/support/AbstractAutowireCapableBeanFactory.java
+9
-5
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
...orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
+4
-2
spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
...g/springframework/orm/jpa/hibernate/hibernate-manager.xml
+10
-4
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
浏览文件 @
8b5d3559
...
...
@@ -325,8 +325,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
}
@Override
public
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
b
eanName
)
throws
BeansException
{
return
resolveDependency
(
descriptor
,
b
eanName
,
null
,
null
);
public
Object
resolveDependency
(
DependencyDescriptor
descriptor
,
String
requestingB
eanName
)
throws
BeansException
{
return
resolveDependency
(
descriptor
,
requestingB
eanName
,
null
,
null
);
}
...
...
@@ -802,10 +802,14 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
if
(
objectType
.
value
!=
null
)
{
return
objectType
.
value
;
}
else
{
// No type found for shortcut FactoryBean instance:
// fall back to full creation of the FactoryBean instance.
return
super
.
getTypeForFactoryBean
(
beanName
,
mbd
);
}
}
// No type found - fall back to full creation of the FactoryBean instance.
return
super
.
getTypeForFactoryBean
(
beanName
,
mbd
);
return
null
;
}
/**
...
...
@@ -824,7 +828,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
SmartInstantiationAwareBeanPostProcessor
ibp
=
(
SmartInstantiationAwareBeanPostProcessor
)
bp
;
exposedObject
=
ibp
.
getEarlyBeanReference
(
exposedObject
,
beanName
);
if
(
exposedObject
==
null
)
{
return
exposedObject
;
return
null
;
}
}
}
...
...
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
浏览文件 @
8b5d3559
/*
* 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.
...
...
@@ -122,7 +122,9 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests {
@AfterClass
public
static
void
closeContext
()
{
applicationContext
.
close
();
if
(
applicationContext
!=
null
)
{
applicationContext
.
close
();
}
applicationContext
=
null
;
}
...
...
spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
浏览文件 @
8b5d3559
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans
xmlns=
"http://www.springframework.org/schema/beans"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
>
<beans>
<bean
id=
"entityManagerFactory"
class=
"org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
>
<bean
id=
"entityManagerFactory"
class=
"org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
primary=
"true"
>
<property
name=
"persistenceXmlLocation"
value=
"org/springframework/orm/jpa/domain/persistence-context.xml"
/>
<property
name=
"dataSource"
ref=
"dataSource"
/>
<property
name=
"jpaVendorAdapter"
>
...
...
@@ -23,4 +23,10 @@
</property>
</bean>
<bean
id=
"sessionFactory"
factory-bean=
"entityManagerFactory"
factory-method=
"getSessionFactory"
/>
<bean
id=
"hibernateStatistics"
factory-bean=
"sessionFactory"
factory-method=
"getStatistics"
/>
<bean
class=
"org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"
/>
</beans>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录