From commits-return-13443-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Apr 06 08:19:44 2010 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 33278 invoked from network); 6 Apr 2010 08:19:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Apr 2010 08:19:44 -0000 Received: (qmail 33320 invoked by uid 500); 6 Apr 2010 08:19:44 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 33260 invoked by uid 500); 6 Apr 2010 08:19:42 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 33252 invoked by uid 99); 6 Apr 2010 08:19:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 08:19:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 08:19:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 90E02238896F; Tue, 6 Apr 2010 08:19:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 06 Apr 2010 08:19:18 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100406081918.90E02238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)); }