Fixes https://issues.apache.org/jira/browse/AMQ-4840 - Invalid STOMP frame sent on websocket connections with heartbeats.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4db585da Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4db585da Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4db585da Branch: refs/heads/activemq-5.9 Commit: 4db585da15fee9f4a0e4a69cbbd3e023cd31f224 Parents: 8a5c052 Author: Hiram Chirino <[email protected]> Authored: Wed Oct 30 13:55:55 2013 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Tue Mar 11 21:04:23 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/transport/stomp/StompFrame.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/4db585da/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java ---------------------------------------------------------------------- diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java index 0a9fad9..0b2c000 100644 --- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java +++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java @@ -182,6 +182,9 @@ public class StompFrame implements Command { } public String format(boolean forLogging) { + if( !forLogging && getAction().equals(Stomp.Commands.KEEPALIVE) ) { + return "\n"; + } StringBuilder buffer = new StringBuilder(); buffer.append(getAction()); buffer.append("\n");
