Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7b365583
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,发现更多精彩内容 >>
提交
7b365583
编写于
6月 15, 2015
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request from jking-roar/SPR-13111
上级
c41779f8
1153969e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
17 deletion
+26
-17
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
...rg/springframework/messaging/simp/stomp/StompDecoder.java
+4
-4
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java
...springframework/messaging/simp/stomp/StompCodecTests.java
+22
-13
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
浏览文件 @
7b365583
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -215,10 +215,10 @@ public class StompDecoder {
if
(
headerStream
.
size
()
>
0
)
{
String
header
=
new
String
(
headerStream
.
toByteArray
(),
UTF8_CHARSET
);
int
colonIndex
=
header
.
indexOf
(
':'
);
if
(
colonIndex
<=
0
||
colonIndex
==
header
.
length
()
-
1
)
{
if
(
buffer
.
remaining
()
>
0
)
{
if
(
colonIndex
<=
0
)
{
if
(
buffer
.
remaining
()
>
0
)
{
throw
new
StompConversionException
(
"Illegal header: '"
+
header
+
"'. A header must be of the form <name>:
<value>
."
);
"'. A header must be of the form <name>:
[<value>]
."
);
}
}
else
{
...
...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java
浏览文件 @
7b365583
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -176,18 +176,32 @@ public class StompCodecTests {
Buffer
buffer
=
Buffer
.
wrap
(
frame1
+
frame2
);
final
List
<
Message
<
byte
[]>>
messages
=
new
ArrayList
<
Message
<
byte
[]>>();
new
Reactor2StompCodec
().
decoder
(
new
Consumer
<
Message
<
byte
[]>>()
{
@Override
public
void
accept
(
Message
<
byte
[]>
message
)
{
messages
.
add
(
message
);
}
}).
apply
(
buffer
);
new
Reactor2StompCodec
().
decoder
(
messages:
:
add
).
apply
(
buffer
);
assertEquals
(
2
,
messages
.
size
());
assertEquals
(
StompCommand
.
SEND
,
StompHeaderAccessor
.
wrap
(
messages
.
get
(
0
)).
getCommand
());
assertEquals
(
StompCommand
.
DISCONNECT
,
StompHeaderAccessor
.
wrap
(
messages
.
get
(
1
)).
getCommand
());
}
// SPR-13111
@Test
public
void
decodeFrameWithHeaderWithEmptyValue
()
{
String
accept
=
"accept-version:1.1\n"
;
String
valuelessKey
=
"key:\n"
;
Message
<
byte
[]>
frame
=
decode
(
"CONNECT\n"
+
accept
+
valuelessKey
+
"\n\0"
);
StompHeaderAccessor
headers
=
StompHeaderAccessor
.
wrap
(
frame
);
assertEquals
(
StompCommand
.
CONNECT
,
headers
.
getCommand
());
assertEquals
(
2
,
headers
.
toNativeHeaderMap
().
size
());
assertEquals
(
"1.1"
,
headers
.
getFirstNativeHeader
(
"accept-version"
));
assertEquals
(
""
,
headers
.
getFirstNativeHeader
(
"key"
));
assertEquals
(
0
,
frame
.
getPayload
().
length
);
}
@Test
public
void
decodeFrameWithIncompleteCommand
()
{
assertIncompleteDecode
(
"MESSAG"
);
...
...
@@ -234,12 +248,7 @@ public class StompCodecTests {
Buffer
buffer
=
Buffer
.
wrap
(
frame
);
final
List
<
Message
<
byte
[]>>
messages
=
new
ArrayList
<
Message
<
byte
[]>>();
new
Reactor2StompCodec
().
decoder
(
new
Consumer
<
Message
<
byte
[]>>()
{
@Override
public
void
accept
(
Message
<
byte
[]>
message
)
{
messages
.
add
(
message
);
}
}).
apply
(
buffer
);
new
Reactor2StompCodec
().
decoder
(
messages:
:
add
).
apply
(
buffer
);
assertEquals
(
1
,
messages
.
size
());
assertEquals
(
SimpMessageType
.
HEARTBEAT
,
StompHeaderAccessor
.
wrap
(
messages
.
get
(
0
)).
getMessageType
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录