Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2b1ff4c5
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 搜索 >>
提交
2b1ff4c5
编写于
6月 29, 2014
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix condition in SubProtocolWebSocketHandler
Issue: SPR-11884
上级
9880d2b5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
7 deletion
+4
-7
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
...ork/web/socket/messaging/SubProtocolWebSocketHandler.java
+3
-7
spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
...eb/socket/messaging/SubProtocolWebSocketHandlerTests.java
+1
-0
未找到文件。
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
浏览文件 @
2b1ff4c5
...
...
@@ -70,7 +70,7 @@ public class SubProtocolWebSocketHandler implements WebSocketHandler,
* connection isn't doing well (proxy issue, slow network?) and can be closed.
* @see #checkSessions()
*/
private
final
int
TIME_TO_FIRST_MESSAGE
=
60
*
1000
;
private
static
final
int
TIME_TO_FIRST_MESSAGE
=
60
*
1000
;
private
final
Log
logger
=
LogFactory
.
getLog
(
SubProtocolWebSocketHandler
.
class
);
...
...
@@ -298,10 +298,6 @@ public class SubProtocolWebSocketHandler implements WebSocketHandler,
if
(
holder
!=
null
)
{
holder
.
setHasHandledMessages
();
}
else
{
// Should never happen
throw
new
IllegalStateException
(
"Session not found: "
+
session
);
}
checkSessions
();
}
...
...
@@ -366,7 +362,7 @@ public class SubProtocolWebSocketHandler implements WebSocketHandler,
*/
private
void
checkSessions
()
throws
IOException
{
long
currentTime
=
System
.
currentTimeMillis
();
if
(!
isRunning
()
&&
currentTime
-
this
.
lastSessionCheckTime
<
TIME_TO_FIRST_MESSAGE
)
{
if
(!
isRunning
()
||
(
currentTime
-
this
.
lastSessionCheckTime
<
TIME_TO_FIRST_MESSAGE
)
)
{
return
;
}
if
(
this
.
sessionCheckLock
.
tryLock
())
{
...
...
@@ -376,7 +372,7 @@ public class SubProtocolWebSocketHandler implements WebSocketHandler,
continue
;
}
long
timeSinceCreated
=
currentTime
-
holder
.
getCreateTime
();
if
(
holder
.
hasHandledMessages
()
||
timeSinceCreated
<
TIME_TO_FIRST_MESSAGE
)
{
if
(
timeSinceCreated
<
TIME_TO_FIRST_MESSAGE
)
{
continue
;
}
WebSocketSession
session
=
holder
.
getSession
();
...
...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
浏览文件 @
2b1ff4c5
...
...
@@ -165,6 +165,7 @@ public class SubProtocolWebSocketHandlerTests {
new
DirectFieldAccessor
(
sessions
.
get
(
"id1"
)).
setPropertyValue
(
"createTime"
,
sixtyOneSecondsAgo
);
new
DirectFieldAccessor
(
sessions
.
get
(
"id2"
)).
setPropertyValue
(
"createTime"
,
sixtyOneSecondsAgo
);
this
.
webSocketHandler
.
start
();
this
.
webSocketHandler
.
handleMessage
(
session1
,
new
TextMessage
(
"foo"
));
assertTrue
(
session1
.
isOpen
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录