Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b1663585
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,发现更多精彩内容 >>
提交
b1663585
编写于
7月 15, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MessageHeaderAccessor properly removes header even in case of null value
Issue: SPR-14468
上级
d2e105f2
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
30 addition
and
7 deletion
+30
-7
spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
...ingframework/messaging/support/MessageHeaderAccessor.java
+9
-4
spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
...amework/messaging/support/MessageHeaderAccessorTests.java
+21
-3
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
浏览文件 @
b1663585
...
@@ -306,12 +306,17 @@ public class MessageHeaderAccessor {
...
@@ -306,12 +306,17 @@ public class MessageHeaderAccessor {
throw
new
IllegalArgumentException
(
"'"
+
name
+
"' header is read-only"
);
throw
new
IllegalArgumentException
(
"'"
+
name
+
"' header is read-only"
);
}
}
verifyType
(
name
,
value
);
verifyType
(
name
,
value
);
if
(
value
!=
null
)
{
// Modify header if necessary
if
(!
ObjectUtils
.
nullSafeEquals
(
value
,
getHeader
(
name
)))
{
if
(!
ObjectUtils
.
nullSafeEquals
(
value
,
getHeader
(
name
)))
{
this
.
modified
=
true
;
this
.
modified
=
true
;
if
(
value
!=
null
)
{
this
.
headers
.
getRawHeaders
().
put
(
name
,
value
);
this
.
headers
.
getRawHeaders
().
put
(
name
,
value
);
}
}
}
else
{
else
{
// Remove header if available
if
(
this
.
headers
.
containsKey
(
name
))
{
this
.
modified
=
true
;
this
.
headers
.
getRawHeaders
().
remove
(
name
);
this
.
headers
.
getRawHeaders
().
remove
(
name
);
}
}
}
}
...
...
spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
浏览文件 @
b1663585
/*
/*
* Copyright 2002-201
4
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.
...
@@ -18,6 +18,7 @@ package org.springframework.messaging.support;
...
@@ -18,6 +18,7 @@ package org.springframework.messaging.support;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -40,6 +41,7 @@ import static org.junit.Assert.*;
...
@@ -40,6 +41,7 @@ import static org.junit.Assert.*;
*
*
* @author Rossen Stoyanchev
* @author Rossen Stoyanchev
* @author Sebastien Deleuze
* @author Sebastien Deleuze
* @author Juergen Hoeller
*/
*/
public
class
MessageHeaderAccessorTests
{
public
class
MessageHeaderAccessorTests
{
...
@@ -89,6 +91,24 @@ public class MessageHeaderAccessorTests {
...
@@ -89,6 +91,24 @@ public class MessageHeaderAccessorTests {
assertEquals
(
"baz"
,
actual
.
get
(
"bar"
));
assertEquals
(
"baz"
,
actual
.
get
(
"bar"
));
}
}
@Test
public
void
testRemoveHeader
()
{
Message
<?>
message
=
new
GenericMessage
<>(
"payload"
,
Collections
.
singletonMap
(
"foo"
,
"bar"
));
MessageHeaderAccessor
accessor
=
new
MessageHeaderAccessor
(
message
);
accessor
.
removeHeader
(
"foo"
);
Map
<
String
,
Object
>
headers
=
accessor
.
toMap
();
assertFalse
(
headers
.
containsKey
(
"foo"
));
}
@Test
public
void
testRemoveHeaderEvenIfNull
()
{
Message
<?>
message
=
new
GenericMessage
<>(
"payload"
,
Collections
.
singletonMap
(
"foo"
,
null
));
MessageHeaderAccessor
accessor
=
new
MessageHeaderAccessor
(
message
);
accessor
.
removeHeader
(
"foo"
);
Map
<
String
,
Object
>
headers
=
accessor
.
toMap
();
assertFalse
(
headers
.
containsKey
(
"foo"
));
}
@Test
@Test
public
void
removeHeaders
()
{
public
void
removeHeaders
()
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
...
@@ -153,7 +173,6 @@ public class MessageHeaderAccessorTests {
...
@@ -153,7 +173,6 @@ public class MessageHeaderAccessorTests {
@Test
@Test
public
void
toMap
()
{
public
void
toMap
()
{
MessageHeaderAccessor
accessor
=
new
MessageHeaderAccessor
();
MessageHeaderAccessor
accessor
=
new
MessageHeaderAccessor
();
accessor
.
setHeader
(
"foo"
,
"bar1"
);
accessor
.
setHeader
(
"foo"
,
"bar1"
);
...
@@ -380,7 +399,6 @@ public class MessageHeaderAccessorTests {
...
@@ -380,7 +399,6 @@ public class MessageHeaderAccessorTests {
}
}
public
static
class
TestMessageHeaderAccessor
extends
MessageHeaderAccessor
{
public
static
class
TestMessageHeaderAccessor
extends
MessageHeaderAccessor
{
private
TestMessageHeaderAccessor
()
{
private
TestMessageHeaderAccessor
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录