root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix issue with forwarding messaging to STOMP broker

This commit is contained in:
Rossen Stoyanchev 2013-10-15 10:55:01 -04:00
parent 4e3390ae04
commit 17aea892f0
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
View File

@ -283,7 +283,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
if (SimpMessageType.MESSAGE.equals(messageType)) {
sessionId = (sessionId == null) ? SystemStompRelaySession.ID : sessionId;
headers.setSessionId(sessionId);
headers.updateStompCommandAsClientMessage();
command = headers.updateStompCommandAsClientMessage();
message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();
}
@ -292,7 +292,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
return;
}
if (command != null && command.requiresDestination() && !checkDestinationPrefix(destination)) {
if ((command != null) && command.requiresDestination() && !checkDestinationPrefix(destination)) {
return;
}
@ -386,7 +386,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
readStompFrame(message);
}
});
forwardInternal(tcpConn, connectMessage);
forwardInternal(connectMessage, tcpConn);
}
protected void connectionClosed() {
@ -445,7 +445,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
logger.warn("Connection to STOMP broker is not active");
handleForwardFailure(message);
}
else if (!forwardInternal(tcpConnection, message)) {
else if (!forwardInternal(message, tcpConnection)) {
handleForwardFailure(message);
}
}
@ -457,7 +457,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
}
private boolean forwardInternal(
TcpConnection<Message<byte[]>, Message<byte[]>> tcpConnection, Message<?> message) {
Message<?> message, TcpConnection<Message<byte[]>, Message<byte[]>> tcpConnection) {
Assert.isInstanceOf(byte[].class, message.getPayload(), "Message's payload must be a byte[]");

4
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
View File

@ -220,7 +220,7 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
return toNativeHeaderMap();
}
public void updateStompCommandAsClientMessage() {
public StompCommand updateStompCommandAsClientMessage() {
Assert.state(SimpMessageType.MESSAGE.equals(getMessageType()),
"Unexpected message type " + getMessage());
@ -231,6 +231,8 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
else if (!getCommand().equals(StompCommand.SEND)) {
throw new IllegalStateException("Unexpected STOMP command " + getCommand());
}
return getCommand();
}
public void updateStompCommandAsServerMessage() {

4
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
View File

@ -113,7 +113,9 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
}
}
// test "host" header (virtualHost property) when TCP client is behind interface and configurable
// When TCP client is behind interface and configurable:
// test "host" header (virtualHost property)
// test "/user/.." destination is excluded
@Test
public void publishSubscribe() throws Exception {