Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
edbc1e92
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,发现更多精彩内容 >>
提交
edbc1e92
编写于
9月 13, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid outdated Tibco workaround in shouldCommitAfterNoMessageReceived
Issue: SPR-14697
上级
fa820bc0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
11 deletion
+3
-11
spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
...jms/listener/AbstractPollingMessageListenerContainer.java
+3
-11
未找到文件。
spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
浏览文件 @
edbc1e92
/*
/*
* 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");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -91,8 +91,6 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
...
@@ -91,8 +91,6 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
private
long
receiveTimeout
=
DEFAULT_RECEIVE_TIMEOUT
;
private
long
receiveTimeout
=
DEFAULT_RECEIVE_TIMEOUT
;
private
volatile
Boolean
commitAfterNoMessageReceived
;
@Override
@Override
public
void
setSessionTransacted
(
boolean
sessionTransacted
)
{
public
void
setSessionTransacted
(
boolean
sessionTransacted
)
{
...
@@ -347,7 +345,6 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
...
@@ -347,7 +345,6 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
}
}
noMessageReceived
(
invoker
,
sessionToUse
);
noMessageReceived
(
invoker
,
sessionToUse
);
// Nevertheless call commit, in order to reset the transaction timeout (if any).
// Nevertheless call commit, in order to reset the transaction timeout (if any).
// However, don't do this on Tibco since this may lead to a deadlock there.
if
(
shouldCommitAfterNoMessageReceived
(
sessionToUse
))
{
if
(
shouldCommitAfterNoMessageReceived
(
sessionToUse
))
{
commitIfNecessary
(
sessionToUse
,
message
);
commitIfNecessary
(
sessionToUse
,
message
);
}
}
...
@@ -381,17 +378,12 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
...
@@ -381,17 +378,12 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
/**
/**
* Determine whether to trigger a commit after no message has been received.
* Determine whether to trigger a commit after no message has been received.
* This is a good idea on any JMS provider other than Tibco, which is what
* This is a good idea on any modern-day JMS provider.
* this default implementation checks for.
* @param session the current JMS Session which received no message
* @param session the current JMS Session which received no message
* @return whether to call {@link #commitIfNecessary} on the given Session
* @return whether to call {@link #commitIfNecessary} on the given Session
*/
*/
protected
boolean
shouldCommitAfterNoMessageReceived
(
Session
session
)
{
protected
boolean
shouldCommitAfterNoMessageReceived
(
Session
session
)
{
if
(
this
.
commitAfterNoMessageReceived
==
null
)
{
return
true
;
Session
target
=
ConnectionFactoryUtils
.
getTargetSession
(
session
);
this
.
commitAfterNoMessageReceived
=
!
target
.
getClass
().
getName
().
startsWith
(
"com.tibco.tibjms."
);
}
return
this
.
commitAfterNoMessageReceived
;
}
}
/**
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录