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/21 14:59:58 UTC
activemq-artemis git commit: reapplying Don't auto-send STOMP
content-length header if one was explicitly set I reverted this change by
accident
Repository: activemq-artemis
Updated Branches:
refs/heads/master 82639f590 -> 8353bd1f7
reapplying Don't auto-send STOMP content-length header if one was explicitly set
I reverted this change by accident
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8353bd1f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8353bd1f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8353bd1f
Branch: refs/heads/master
Commit: 8353bd1f77f30a615c633d81a525e2e542f172e4
Parents: 82639f5
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 21 13:55:18 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 21 13:59:38 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/8353bd1f/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 83dc4f4..3cd49e4 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
@@ -73,7 +73,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);