Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1be544f8
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,发现更多精彩内容 >>
提交
1be544f8
编写于
5月 03, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JtaTransactionManager explicitly resets transaction timeout after completion
Issue: SPR-14239
上级
5ac31fb3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
25 addition
and
8 deletion
+25
-8
spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
...pringframework/transaction/jta/JtaTransactionManager.java
+22
-7
spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
...springframework/transaction/jta/JtaTransactionObject.java
+3
-1
未找到文件。
spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
浏览文件 @
1be544f8
/*
* Copyright 2002-201
3
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.
...
...
@@ -748,8 +748,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
}
catch
(
NamingException
ex
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"No JTA TransactionSynchronizationRegistry found at default JNDI location ["
+
jndiName
+
"]"
,
ex
);
logger
.
debug
(
"No JTA TransactionSynchronizationRegistry found at default JNDI location ["
+
jndiName
+
"]"
,
ex
);
}
}
}
...
...
@@ -912,6 +911,9 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
protected
void
applyTimeout
(
JtaTransactionObject
txObject
,
int
timeout
)
throws
SystemException
{
if
(
timeout
>
TransactionDefinition
.
TIMEOUT_DEFAULT
)
{
txObject
.
getUserTransaction
().
setTransactionTimeout
(
timeout
);
if
(
timeout
>
0
)
{
txObject
.
resetTransactionTimeout
=
true
;
}
}
}
...
...
@@ -1169,6 +1171,19 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
}
}
@Override
protected
void
doCleanupAfterCompletion
(
Object
transaction
)
{
JtaTransactionObject
txObject
=
(
JtaTransactionObject
)
transaction
;
if
(
txObject
.
resetTransactionTimeout
)
{
try
{
txObject
.
getUserTransaction
().
setTransactionTimeout
(
0
);
}
catch
(
SystemException
ex
)
{
logger
.
debug
(
"Failed to reset transaction timeout after JTA completion"
,
ex
);
}
}
}
//---------------------------------------------------------------------
// Implementation of TransactionFactory interface
...
...
spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
浏览文件 @
1be544f8
/*
* Copyright 2002-201
2
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.
...
...
@@ -39,6 +39,8 @@ public class JtaTransactionObject implements SmartTransactionObject {
private
final
UserTransaction
userTransaction
;
boolean
resetTransactionTimeout
=
false
;
/**
* Create a new JtaTransactionObject for the given JTA UserTransaction.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录