Extract method

Per discussion with Simon.

Author: michaelklishin

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

@@ -281,11 +281,8 @@ public void start()
 
         // start the main loop going
         MainLoop loop = new MainLoop();
-        final String threadName = "AMQP Connection " + getHostAddress() + ":" + getPort();
-        mainLoopThread = threadFactory.newThread(loop);
-        if(Environment.isAllowedToModifyThreads()) {
-            mainLoopThread.setName(threadName);
-        }
+        final String name = "AMQP Connection " + getHostAddress() + ":" + getPort();
+        mainLoopThread = Environment.newThread(threadFactory, loop, name);
         mainLoopThread.start();
         // after this point clear-up of MainLoop is triggered by closing the frameHandler.
 
@@ -669,11 +666,9 @@ public void handleConnectionClose(Command closeCommand) {
         } catch (IOException _) { } // ignore
         _brokerInitiatedShutdown = true;
         SocketCloseWait scw = new SocketCloseWait(sse);
-        Thread waiter = threadFactory.newThread(scw);
-        if(Environment.isAllowedToModifyThreads()) {
-            waiter.setName("AMQP Connection Closing Monitor " +
-                                   getHostAddress() + ":" + getPort());
-        }
+        final String name = "AMQP Connection Closing Monitor " +
+                                    getHostAddress() + ":" + getPort();
+        Thread waiter = Environment.newThread(threadFactory, scw, name);
         waiter.start();
     }
 

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

@@ -113,11 +113,7 @@ public void run() {
                 ssWorkService.shutdown();
             }
         };
-        Thread shutdownThread = threadFactory.newThread(target);
-        if(Environment.isAllowedToModifyThreads()) {
-            shutdownThread.setName("ConsumerWorkService shutdown monitor");
-            shutdownThread.setDaemon(true);
-        }
+        Thread shutdownThread = Environment.newThread(threadFactory, target, "ConsumerWorkService shutdown monitor", true);
         shutdownThread.start();
     }
 

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

@@ -1,5 +1,7 @@
 package com.rabbitmq.client.impl;
 
+import java.util.concurrent.ThreadFactory;
+
 /**
  * Infers information about the execution environment, e.g.
  * security permissions.
@@ -15,4 +17,20 @@ public static boolean isAllowedToModifyThreads() {
             return false;
         }
     }
+
+    public static Thread newThread(ThreadFactory factory, Runnable runnable, String name) {
+        Thread t = factory.newThread(runnable);
+        if(isAllowedToModifyThreads()) {
+            t.setName(name);
+        }
+        return t;
+    }
+
+    public static Thread newThread(ThreadFactory factory, Runnable runnable, String name, boolean isDaemon) {
+        Thread t = newThread(factory, runnable, name);
+        if(isAllowedToModifyThreads()) {
+            t.setDaemon(isDaemon);
+        }
+        return t;
+    }
 }