You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by gt...@apache.org on 2012/11/29 23:04:33 UTC

svn commit: r1415404 - /activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java

Author: gtully
Date: Thu Nov 29 22:04:32 2012
New Revision: 1415404

URL: http://svn.apache.org/viewvc?rev=1415404&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4180 - fix regression in org.apache.activemq.broker.BrokerRedeliveryTest

Modified:
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java

Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java?rev=1415404&r1=1415403&r2=1415404&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java (original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java Thu Nov 29 22:04:32 2012
@@ -138,6 +138,8 @@ public final class MarshallingSupport {
             marshalByteArray(out, (byte[])value);
         } else if (value.getClass() == String.class) {
             marshalString(out, (String)value);
+        } else  if (value.getClass() == UTF8Buffer.class) {
+            marshalString(out, value.toString());
         } else if (value instanceof Map) {
             out.writeByte(MAP_TYPE);
             marshalPrimitiveMap((Map)value, out);