Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set content-type to STOMP ERROR frames 

Not setting it to directly instantiated 1.0 frames though, as
content-type is not in the 1.0 spec. However the 1.0 spec does not
actually forbid headers outside of the spec so it shouldn't hurt if we
end up setting it for some frames sent over a 1.0 connection.
This commit is contained in:
Ville Skyttä 2015-07-14 11:06:58 +03:00 committed by Clebert Suconic
parent 4167c5f2cc
commit b38236df82
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompException.java
View File

@ -91,6 +91,7 @@ public class ActiveMQStompException extends Exception
if (body != null) if (body != null)
{ {
frame.addHeader(Stomp.Headers.CONTENT_TYPE, "text/plain");
frame.setByteBody(body.getBytes(StandardCharsets.UTF_8)); frame.setByteBody(body.getBytes(StandardCharsets.UTF_8));
} }
else else

1
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
View File

@ -211,6 +211,7 @@ public class StompSession implements SessionCallback
if (stompSubscription != null) if (stompSubscription != null)
{ {
StompFrame frame = connection.getFrameHandler().createStompFrame(Stomp.Responses.ERROR); StompFrame frame = connection.getFrameHandler().createStompFrame(Stomp.Responses.ERROR);
frame.addHeader(Stomp.Headers.CONTENT_TYPE, "text/plain");
frame.setBody("consumer with ID " + consumerId + " disconnected by server"); frame.setBody("consumer with ID " + consumerId + " disconnected by server");
connection.sendFrame(frame); connection.sendFrame(frame);
} }

1
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
View File

@ -105,6 +105,7 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
// not valid // not valid
response = createStompFrame(Stomp.Responses.ERROR); response = createStompFrame(Stomp.Responses.ERROR);
response.setNeedsDisconnect(true); response.setNeedsDisconnect(true);
response.addHeader(Stomp.Headers.CONTENT_TYPE, "text/plain");
response.addHeader(Stomp.Headers.Error.MESSAGE, "Failed to connect"); response.addHeader(Stomp.Headers.Error.MESSAGE, "Failed to connect");
response.setBody("The login account is not valid."); response.setBody("The login account is not valid.");
} }