Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
792991a8
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 搜索 >>
提交
792991a8
编写于
12月 04, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup after unexpected exception from external delegation call
Issue: SPR-17559 (cherry picked from commit
c024bdcc
)
上级
b8480ea0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
27 deletion
+41
-27
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
.../org/springframework/jdbc/datasource/DataSourceUtils.java
+21
-14
spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
...rg/springframework/orm/jpa/EntityManagerFactoryUtils.java
+20
-13
未找到文件。
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
浏览文件 @
792991a8
...
...
@@ -111,21 +111,28 @@ public abstract class DataSourceUtils {
Connection
con
=
dataSource
.
getConnection
();
if
(
TransactionSynchronizationManager
.
isSynchronizationActive
())
{
// Use same Connection for further JDBC actions within the transaction.
// Thread-bound object will get removed by synchronization at transaction completion.
ConnectionHolder
holderToUse
=
conHolder
;
if
(
holderToUse
==
null
)
{
holderToUse
=
new
ConnectionHolder
(
con
);
}
else
{
holderToUse
.
setConnection
(
con
);
try
{
// Use same Connection for further JDBC actions within the transaction.
// Thread-bound object will get removed by synchronization at transaction completion.
ConnectionHolder
holderToUse
=
conHolder
;
if
(
holderToUse
==
null
)
{
holderToUse
=
new
ConnectionHolder
(
con
);
}
else
{
holderToUse
.
setConnection
(
con
);
}
holderToUse
.
requested
();
TransactionSynchronizationManager
.
registerSynchronization
(
new
ConnectionSynchronization
(
holderToUse
,
dataSource
));
holderToUse
.
setSynchronizedWithTransaction
(
true
);
if
(
holderToUse
!=
conHolder
)
{
TransactionSynchronizationManager
.
bindResource
(
dataSource
,
holderToUse
);
}
}
holderToUse
.
requested
();
TransactionSynchronizationManager
.
registerSynchronization
(
new
ConnectionSynchronization
(
holderToUse
,
dataSource
));
holderToUse
.
setSynchronizedWithTransaction
(
true
);
if
(
holderToUse
!=
conHolder
)
{
TransactionSynchronizationManager
.
bindResource
(
dataSource
,
holderToUse
);
catch
(
RuntimeException
ex
)
{
// Unexpected exception from external delegation call -> close Connection and rethrow.
releaseConnection
(
con
,
dataSource
);
throw
ex
;
}
}
...
...
spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
浏览文件 @
792991a8
...
...
@@ -285,21 +285,28 @@ public abstract class EntityManagerFactoryUtils {
em
=
(!
CollectionUtils
.
isEmpty
(
properties
)
?
emf
.
createEntityManager
(
properties
)
:
emf
.
createEntityManager
());
}
// Use same EntityManager for further JPA operations within the transaction.
// Thread-bound object will get removed by synchronization at transaction completion.
emHolder
=
new
EntityManagerHolder
(
em
);
if
(
synchronizedWithTransaction
)
{
Object
transactionData
=
prepareTransaction
(
em
,
emf
);
TransactionSynchronizationManager
.
registerSynchronization
(
new
TransactionalEntityManagerSynchronization
(
emHolder
,
emf
,
transactionData
,
true
));
emHolder
.
setSynchronizedWithTransaction
(
true
);
try
{
// Use same EntityManager for further JPA operations within the transaction.
// Thread-bound object will get removed by synchronization at transaction completion.
emHolder
=
new
EntityManagerHolder
(
em
);
if
(
synchronizedWithTransaction
)
{
Object
transactionData
=
prepareTransaction
(
em
,
emf
);
TransactionSynchronizationManager
.
registerSynchronization
(
new
TransactionalEntityManagerSynchronization
(
emHolder
,
emf
,
transactionData
,
true
));
emHolder
.
setSynchronizedWithTransaction
(
true
);
}
else
{
// Unsynchronized - just scope it for the transaction, as demanded by the JPA 2.1 spec...
TransactionSynchronizationManager
.
registerSynchronization
(
new
TransactionScopedEntityManagerSynchronization
(
emHolder
,
emf
));
}
TransactionSynchronizationManager
.
bindResource
(
emf
,
emHolder
);
}
else
{
// Un
synchronized - just scope it for the transaction, as demanded by the JPA 2.1 spec..
.
TransactionSynchronizationManager
.
registerSynchronization
(
new
TransactionScopedEntityManagerSynchronization
(
emHolder
,
emf
))
;
catch
(
RuntimeException
ex
)
{
// Un
expected exception from external delegation call -> close EntityManager and rethrow
.
closeEntityManager
(
em
);
throw
ex
;
}
TransactionSynchronizationManager
.
bindResource
(
emf
,
emHolder
);
return
em
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录