Merge 24795 into default.

Author: Steve Powell

src/com/rabbitmq/client/ConnectionFactory.java

@@ -256,7 +256,7 @@ private String uriDecode(String s) {
             // form encoding.  So protect plus signs.
             return URLDecoder.decode(s.replace("+", "%2B"), "US-ASCII");
         }
-        catch (java.io.UnsupportedEncodingException e) {
+        catch (IOException e) {
             throw new RuntimeException(e);
         }
     }

src/com/rabbitmq/client/RpcClient.java

@@ -229,7 +229,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 (IOException _) {
+            request = message.getBytes();
+        }
+        byte[] reply = primitiveCall(request);
+        try {
+            return new String(reply, StringRpcServer.STRING_ENCODING);
+        } catch (IOException _) {
+           return new String(reply);
+        }
     }
 
     /**

src/com/rabbitmq/client/StringRpcServer.java

@@ -18,7 +18,6 @@
 package com.rabbitmq.client;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 /**
  * Subclass of RpcServer which accepts UTF-8 string requests.
@@ -30,6 +29,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,14 +40,14 @@ public byte[] handleCall(byte[] requestBody, AMQP.BasicProperties replyPropertie
     {
         String request;
         try {
-            request = new String(requestBody, "UTF-8");
-        } catch (UnsupportedEncodingException uee) {
+            request = new String(requestBody, STRING_ENCODING);
+        } catch (IOException _) {
             request = new String(requestBody);
         }
         String reply = handleStringCall(request, replyProperties);
         try {
-            return reply.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException uee) {
+            return reply.getBytes(STRING_ENCODING);
+        } catch (IOException _) {
             return reply.getBytes();
         }
     }
@@ -69,14 +70,14 @@ public String handleStringCall(String request)
 
     /**
      * Overridden to do UTF-8 processing, and delegate to
-     * handleStringCast. If UTF-8 is not understood by this JVM, falls
-     * back to the platform default.
+     * handleStringCast. If requestBody cannot be interpreted as UTF-8
+     * tries the platform default.
      */
     public void handleCast(byte[] requestBody)
     {
         try {
-            handleStringCast(new String(requestBody, "UTF-8"));
-        } catch (UnsupportedEncodingException uee) {
+            handleStringCast(new String(requestBody, STRING_ENCODING));
+        } catch (IOException _) {
             handleStringCast(new String(requestBody));
         }
     }

test/src/com/rabbitmq/client/test/ChannelNumberAllocationTests.java

@@ -16,9 +16,16 @@
 
 package com.rabbitmq.client.test;
 
-import com.rabbitmq.client.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import junit.framework.TestCase;
-import java.util.*;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
 
 public class ChannelNumberAllocationTests extends TestCase{
   static int CHANNEL_COUNT = 100;

test/src/com/rabbitmq/client/test/CloseInMainLoop.java

@@ -16,16 +16,25 @@
 
 package com.rabbitmq.client.test;
 
-import com.rabbitmq.client.impl.*;
-import com.rabbitmq.client.*;
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.SocketFactory;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Command;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.Consumer;
+import com.rabbitmq.client.DefaultConsumer;
+import com.rabbitmq.client.Envelope;
+import com.rabbitmq.client.impl.AMQConnection;
+import com.rabbitmq.client.impl.DefaultExceptionHandler;
+import com.rabbitmq.client.impl.SocketFrameHandler;
+
 public class CloseInMainLoop extends BrokerTestCase{
 
   private final CountDownLatch closeLatch = new CountDownLatch(1);

test/src/com/rabbitmq/client/test/QueueingConsumerShutdownTests.java

@@ -16,10 +16,13 @@
 
 package com.rabbitmq.client.test;
 
-import com.rabbitmq.client.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.QueueingConsumer;
+import com.rabbitmq.client.ShutdownSignalException;
 
 public class QueueingConsumerShutdownTests extends BrokerTestCase{
   static final String QUEUE = "some-queue";
@@ -52,7 +55,7 @@ public void testNThreadShutdown() throws Exception{
     }
 
     connection.close();
-    
+
     // Far longer than this could reasonably take
     assertTrue(latch.await(5, TimeUnit.SECONDS));
     assertEquals(0, count.get());

test/src/com/rabbitmq/client/test/performance/CLIHelper.java

@@ -17,10 +17,16 @@
 
 package com.rabbitmq.client.test.performance;
 
-import org.apache.commons.cli.*;
-
 import java.util.Iterator;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
 /**
  * Super class for handling repetative CLI stuff
  */
@@ -29,7 +35,7 @@ public class CLIHelper {
     private Options options = new Options();
 
     public static CLIHelper defaultHelper() {
-        Options opts = new Options(); 
+        Options opts = new Options();
         opts.addOption(new Option( "help", "print this message"));
         opts.addOption(new Option("h", "host", true, "broker host"));
         opts.addOption(new Option("p", "port", true, "broker port"));
@@ -48,7 +54,7 @@ public void addOption(Option option) {
     }
 
     public CommandLine parseCommandLine(String [] args) {
-        CommandLineParser parser = new GnuParser();        
+        CommandLineParser parser = new GnuParser();
         CommandLine commandLine = null;
         try {
             commandLine = parser.parse(options, args);

test/src/com/rabbitmq/client/test/performance/ScalabilityTest.java

@@ -17,18 +17,27 @@
 
 package com.rabbitmq.client.test.performance;
 
-import com.rabbitmq.client.*;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.io.FileOutputStream;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.Random;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.MessageProperties;
+import com.rabbitmq.client.ReturnListener;
+
 /**
  * This tests the scalability of the routing tables in two aspects:
  *

test/src/com/rabbitmq/client/test/server/Bug19219Test.java

@@ -16,7 +16,6 @@
 
 package com.rabbitmq.client.test.server;
 
-import com.rabbitmq.client.test.*;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
@@ -29,6 +28,7 @@
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.test.BrokerTestCase;
 
 /**
  * Test for bug 19219 - timeouts due to task parallelism in channel

test/src/com/rabbitmq/examples/ChannelCreationPerformance.java

@@ -16,8 +16,12 @@
 
 package com.rabbitmq.examples;
 
-import com.rabbitmq.client.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
 
 class ChannelCreationPerformance {
     static Connection connect() throws Exception{