String RPC uses UTF-8 consistently

Author: Emile Joubert

src/com/rabbitmq/client/RpcClient.java

@@ -17,12 +17,7 @@
 
 package com.rabbitmq.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
+import java.io.*;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -229,7 +224,18 @@ public byte[] primitiveCall(byte[] message)
     public String stringCall(String message)
         throws IOException, ShutdownSignalException, TimeoutException
     {
-        return new String(primitiveCall(message.getBytes()));
+        byte[] request;
+        try {
+            request = message.getBytes(StringRpcServer.STRING_ENCODING);
+        } catch (UnsupportedEncodingException uee) {
+            request = message.getBytes();
+        }
+        byte[] reply = primitiveCall(request);
+        try {
+            return new String(reply, StringRpcServer.STRING_ENCODING);
+        } catch (UnsupportedEncodingException uee) {
+           return new String(reply);
+        }
     }
 
     /**

src/com/rabbitmq/client/StringRpcServer.java

@@ -30,6 +30,8 @@ public StringRpcServer(Channel channel) throws IOException
     public StringRpcServer(Channel channel, String queueName) throws IOException
     { super(channel, queueName); }
 
+    public static String STRING_ENCODING = "UTF-8";
+
     /**
      * Overridden to do UTF-8 processing, and delegate to
      * handleStringCall. If UTF-8 is not understood by this JVM, falls
@@ -39,13 +41,13 @@ public byte[] handleCall(byte[] requestBody, AMQP.BasicProperties replyPropertie
     {
         String request;
         try {
-            request = new String(requestBody, "UTF-8");
+            request = new String(requestBody, STRING_ENCODING);
         } catch (UnsupportedEncodingException uee) {
             request = new String(requestBody);
         }
         String reply = handleStringCall(request, replyProperties);
         try {
-            return reply.getBytes("UTF-8");
+            return reply.getBytes(STRING_ENCODING);
         } catch (UnsupportedEncodingException uee) {
             return reply.getBytes();
         }
@@ -75,7 +77,7 @@ public String handleStringCall(String request)
     public void handleCast(byte[] requestBody)
     {
         try {
-            handleStringCast(new String(requestBody, "UTF-8"));
+            handleStringCast(new String(requestBody, STRING_ENCODING));
         } catch (UnsupportedEncodingException uee) {
             handleStringCast(new String(requestBody));
         }