Merged bug21748 into default.

Author: Marek Majkowski

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

@@ -226,7 +226,10 @@ public void start(boolean insist)
         _frameHandler.setTimeout(HANDSHAKE_TIMEOUT);
         _frameHandler.sendHeader();
 
-        new MainLoop().start(); // start the main loop going
+        // start the main loop going
+        Thread ml = new MainLoop();
+        ml.setName("AMQP Connection " + getHost() + ":" + getPort());
+        ml.start();
 
         try {
             // See bug 17389. The MainLoop could have shut down already in
@@ -548,15 +551,17 @@ public void handleConnectionClose(Command closeCommand) {
         }
         _heartbeat = 0; // Do not try to send heartbeats after CloseOk
         _brokerInitiatedShutdown = true;
-        new SocketCloseWait(sse);
+        Thread scw = new SocketCloseWait(sse);
+        scw.setName("AMQP Connection Closing Monitor " +
+                    getHost() + ":" + getPort());
+        scw.start();
     }
 
     private class SocketCloseWait extends Thread {
         private ShutdownSignalException cause;
 
         public SocketCloseWait(ShutdownSignalException sse) {
             cause = sse;
-            start();
         }
 
         @Override public void run() {