You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/20 16:09:15 UTC
[1/2] activemq-artemis git commit: This closes #86 content-length
change on stomp
Repository: activemq-artemis
Updated Branches:
refs/heads/master 96b559307 -> fbfdacde6
This closes #86 content-length change on stomp
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fbfdacde
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fbfdacde
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fbfdacde
Branch: refs/heads/master
Commit: fbfdacde667098ff78612b7402ecc77cb67e1a4c
Parents: 96b5593 642838c
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 20 15:09:07 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 20 15:09:07 2015 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: Don't auto-send STOMP
content-length header if one was explicitly set
Posted by cl...@apache.org.
Don't auto-send STOMP content-length header if one was explicitly set
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/642838c7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/642838c7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/642838c7
Branch: refs/heads/master
Commit: 642838c712080d3af25422f454c673a32a1fa539
Parents: 96b5593
Author: Ville Skyttä <vi...@iki.fi>
Authored: Mon Jul 20 12:01:46 2015 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 20 15:09:07 2015 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/642838c7/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java
index e0572c7..3f41b6d 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java
@@ -66,7 +66,7 @@ public class StompFrameV11 extends StompFrame
head.append(h.getEncodedValue());
head.append(Stomp.NEWLINE);
}
- if (bytesBody != null && bytesBody.length > 0)
+ if (bytesBody != null && bytesBody.length > 0 && !hasHeader(Stomp.Headers.CONTENT_LENGTH))
{
head.append(Stomp.Headers.CONTENT_LENGTH);
head.append(Stomp.Headers.SEPARATOR);