Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
c420f371
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,发现更多精彩内容 >>
提交
c420f371
编写于
6月 12, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix setting of message-id STOMP header
上级
82dfd781
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
49 deletion
+14
-49
spring-websocket/src/main/java/org/springframework/web/messaging/PubSubHeaders.java
...java/org/springframework/web/messaging/PubSubHeaders.java
+1
-0
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java
...org/springframework/web/messaging/stomp/StompHeaders.java
+7
-4
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompWebSocketHandler.java
...rk/web/messaging/stomp/support/StompWebSocketHandler.java
+6
-3
spring-websocket/src/main/java/org/springframework/web/messaging/support/DestinationMessage.java
...ngframework/web/messaging/support/DestinationMessage.java
+0
-42
未找到文件。
spring-websocket/src/main/java/org/springframework/web/messaging/PubSubHeaders.java
浏览文件 @
c420f371
...
@@ -112,6 +112,7 @@ public class PubSubHeaders {
...
@@ -112,6 +112,7 @@ public class PubSubHeaders {
*/
*/
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
protected
PubSubHeaders
(
MessageHeaders
originalHeaders
)
{
protected
PubSubHeaders
(
MessageHeaders
originalHeaders
)
{
Assert
.
notNull
(
originalHeaders
,
"originalHeaders is required"
);
this
.
originalHeaders
=
originalHeaders
;
this
.
originalHeaders
=
originalHeaders
;
this
.
externalSourceHeaders
=
(
originalHeaders
.
get
(
EXTERNAL_SOURCE_HEADERS
)
!=
null
)
?
this
.
externalSourceHeaders
=
(
originalHeaders
.
get
(
EXTERNAL_SOURCE_HEADERS
)
!=
null
)
?
(
Map
<
String
,
List
<
String
>>)
originalHeaders
.
get
(
EXTERNAL_SOURCE_HEADERS
)
:
emptyMultiValueMap
;
(
Map
<
String
,
List
<
String
>>)
originalHeaders
.
get
(
EXTERNAL_SOURCE_HEADERS
)
:
emptyMultiValueMap
;
...
...
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java
浏览文件 @
c420f371
...
@@ -21,6 +21,7 @@ import java.util.HashMap;
...
@@ -21,6 +21,7 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.concurrent.atomic.AtomicLong
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.Message
;
...
@@ -47,7 +48,7 @@ import reactor.util.Assert;
...
@@ -47,7 +48,7 @@ import reactor.util.Assert;
*/
*/
public
class
StompHeaders
extends
PubSubHeaders
{
public
class
StompHeaders
extends
PubSubHeaders
{
private
static
final
String
ID
=
"id"
;
private
static
final
String
STOMP_
ID
=
"id"
;
private
static
final
String
HOST
=
"host"
;
private
static
final
String
HOST
=
"host"
;
...
@@ -78,6 +79,8 @@ public class StompHeaders extends PubSubHeaders {
...
@@ -78,6 +79,8 @@ public class StompHeaders extends PubSubHeaders {
private
static
final
String
STOMP_HEADERS
=
"stompHeaders"
;
private
static
final
String
STOMP_HEADERS
=
"stompHeaders"
;
private
static
final
AtomicLong
messageIdCounter
=
new
AtomicLong
();
private
final
Map
<
String
,
String
>
headers
;
private
final
Map
<
String
,
String
>
headers
;
...
@@ -105,8 +108,8 @@ public class StompHeaders extends PubSubHeaders {
...
@@ -105,8 +108,8 @@ public class StompHeaders extends PubSubHeaders {
super
.
setContentType
(
MediaType
.
parseMediaType
(
contentType
));
super
.
setContentType
(
MediaType
.
parseMediaType
(
contentType
));
}
}
if
(
StompCommand
.
SUBSCRIBE
.
equals
(
getStompCommand
()))
{
if
(
StompCommand
.
SUBSCRIBE
.
equals
(
getStompCommand
()))
{
if
(
getHeaderValue
(
ID
)
!=
null
)
{
if
(
getHeaderValue
(
STOMP_
ID
)
!=
null
)
{
super
.
setSubscriptionId
(
getHeaderValue
(
ID
));
super
.
setSubscriptionId
(
getHeaderValue
(
STOMP_
ID
));
}
}
}
}
}
}
...
@@ -192,7 +195,7 @@ public class StompHeaders extends PubSubHeaders {
...
@@ -192,7 +195,7 @@ public class StompHeaders extends PubSubHeaders {
logger
.
warn
(
"STOMP MESSAGE frame should have a subscription: "
+
this
.
toString
());
logger
.
warn
(
"STOMP MESSAGE frame should have a subscription: "
+
this
.
toString
());
}
}
if
((
getMessageId
()
==
null
))
{
if
((
getMessageId
()
==
null
))
{
this
.
headers
.
put
(
MESSAGE_ID
,
toMessageHeaders
().
get
(
ID
).
toString
());
result
.
set
(
MESSAGE_ID
,
getSessionId
()
+
"-"
+
messageIdCounter
.
getAndIncrement
());
}
}
}
}
...
...
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompWebSocketHandler.java
浏览文件 @
c420f371
...
@@ -211,17 +211,20 @@ public class StompWebSocketHandler extends TextWebSocketHandlerAdapter {
...
@@ -211,17 +211,20 @@ public class StompWebSocketHandler extends TextWebSocketHandlerAdapter {
String
sessionId
=
stompHeaders
.
getSessionId
();
String
sessionId
=
stompHeaders
.
getSessionId
();
if
(
sessionId
==
null
)
{
if
(
sessionId
==
null
)
{
logger
.
error
(
"
Cannot send message without a session id
: "
+
message
);
logger
.
error
(
"
No \"sessionId\" header in message
: "
+
message
);
}
}
WebSocketSession
session
=
getWebSocketSession
(
sessionId
);
WebSocketSession
session
=
getWebSocketSession
(
sessionId
);
if
(
session
==
null
)
{
logger
.
error
(
"Session not found: "
+
message
);
}
byte
[]
payload
;
byte
[]
payload
;
try
{
try
{
MediaType
contentType
=
stompHeaders
.
getContentType
();
MediaType
contentType
=
stompHeaders
.
getContentType
();
payload
=
payloadConverter
.
convertToPayload
(
message
.
getPayload
(),
contentType
);
payload
=
payloadConverter
.
convertToPayload
(
message
.
getPayload
(),
contentType
);
}
}
catch
(
Exception
e
)
{
catch
(
Throwable
t
)
{
logger
.
error
(
"Failed to send "
+
message
,
e
);
logger
.
error
(
"Failed to send "
+
message
,
t
);
return
;
return
;
}
}
...
...
spring-websocket/src/main/java/org/springframework/web/messaging/support/DestinationMessage.java
已删除
100644 → 0
浏览文件 @
82dfd781
/*
* Copyright 2002-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.web.messaging.support
;
import
java.util.Map
;
import
org.springframework.messaging.GenericMessage
;
/**
*
* @author Rossen Stoyanchev
* @since 4.0
*/
public
class
DestinationMessage
<
T
>
extends
GenericMessage
<
T
>
{
public
DestinationMessage
(
T
payload
,
Map
<
String
,
Object
>
headers
)
{
super
(
payload
,
headers
);
}
public
DestinationMessage
(
T
payload
)
{
super
(
payload
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录