Merged bug24634 into default

Author: Emile Joubert

codegen.py

@@ -264,12 +264,12 @@ def printWritePropertiesTo(c):
                 print "            if (this.%s != null) writer.write%s(this.%s);" % (jfName, jfClass, jfName)
         print "        }"
 
-    def printAppendArgumentDebugStringTo(c):
+    def printAppendPropertyDebugStringTo(c):
         appendList = [ "%s=\")\n               .append(this.%s)\n               .append(\""
                        % (f.name, java_field_name(f.name))
                        for f in c.fields ]
         print
-        print "        public void appendArgumentDebugStringTo(StringBuilder acc) {"
+        print "        public void appendPropertyDebugStringTo(StringBuilder acc) {"
         print "            acc.append(\"(%s)\");" % (", ".join(appendList))
         print "        }"
 
@@ -386,7 +386,7 @@ def printSetter(fieldType, fieldName):
             printSetter(jType, jName)
 
         printWritePropertiesTo(c)
-        printAppendArgumentDebugStringTo(c)
+        printAppendPropertyDebugStringTo(c)
         printPropertiesBuilderClass(c)
 
         print "    }"

src/com/rabbitmq/client/impl/AMQCommand.java

@@ -146,7 +146,7 @@ private static StringBuilder contentBodyStringBuilder(byte[] body, boolean suppr
             if (suppressBody) {
                 return new StringBuilder().append(body.length).append(" bytes of payload");
             } else {
-                return new StringBuilder().append('\"').append(body).append('\"');
+                return new StringBuilder().append('\"').append(new String(body, "UTF-8")).append('\"');
             }
         } catch (Exception e) {
             return new StringBuilder().append('|').append(body.length).append('|');