You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/04/06 10:19:18 UTC
svn commit: r931047 - in /activemq/trunk:
activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java
Author: dejanb
Date: Tue Apr 6 08:19:18 2010
New Revision: 931047
URL: http://svn.apache.org/viewvc?rev=931047&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2684 - encoding for web sockets and stomp
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java?rev=931047&r1=931046&r2=931047&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java Tue Apr 6 08:19:18 2010
@@ -181,7 +181,7 @@ public class StompFrame implements Comma
buffer.append("\n");
if (getContent() != null) {
try {
- buffer.append(new String(getContent()));
+ buffer.append(new String(getContent(), "UTF-8"));
} catch (Throwable e) {
buffer.append(Arrays.toString(getContent()));
}
Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java?rev=931047&r1=931046&r2=931047&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java Tue Apr 6 08:19:18 2010
@@ -49,7 +49,7 @@ class StompSocket extends TransportSuppo
public void onMessage(byte frame, String data) {
try {
- protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes())));
+ protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8"))));
} catch (Exception e) {
onException(IOExceptionSupport.create(e));
}