Merge pull request rabbitmq#33 from vikinghawk/threadFactory

michaelklishin · michaelklishin · commit c998e0c6f9bf · 2015-03-13T09:51:16.000+03:00
Use custom thread factory on RecoveryAware connection / channel manager
diff --git a/src/com/rabbitmq/client/impl/Environment.java b/src/com/rabbitmq/client/impl/Environment.java
@@ -9,9 +9,11 @@
 class Environment {
     public static boolean isAllowedToModifyThreads() {
         try {
-            SecurityManager sm = new SecurityManager();
-            sm.checkPermission(new RuntimePermission("modifyThread"));
-            sm.checkPermission(new RuntimePermission("modifyThreadGroup"));
+            SecurityManager sm = System.getSecurityManager();
+            if(sm != null) {
+                sm.checkPermission(new RuntimePermission("modifyThread"));
+                sm.checkPermission(new RuntimePermission("modifyThreadGroup"));
+            }
             return true;
         } catch (SecurityException se) {
             return false;
diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java b/src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java
@@ -17,6 +17,6 @@ public RecoveryAwareAMQConnection(ConnectionParams params, FrameHandler handler)
 
     @Override
     protected RecoveryAwareChannelManager instantiateChannelManager(int channelMax, ThreadFactory threadFactory) {
-        return new RecoveryAwareChannelManager(super._workService, channelMax);
+        return new RecoveryAwareChannelManager(super._workService, channelMax, threadFactory);
     }
 }
diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java b/src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java
@@ -5,12 +5,19 @@
 import com.rabbitmq.client.impl.ChannelN;
 import com.rabbitmq.client.impl.ConsumerWorkService;
 
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
 /**
  * @since 3.3.0
  */
 public class RecoveryAwareChannelManager extends ChannelManager {
     public RecoveryAwareChannelManager(ConsumerWorkService workService, int channelMax) {
-        super(workService, channelMax);
+        this(workService, channelMax, Executors.defaultThreadFactory());
+    }
+
+    public RecoveryAwareChannelManager(ConsumerWorkService workService, int channelMax, ThreadFactory threadFactory) {
+        super(workService, channelMax, threadFactory);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ public RecoveryAwareAMQConnection(ConnectionParams params, FrameHandler handler)`
`17`	`17`
`18`	`18`	`@Override`
`19`	`19`	`protected RecoveryAwareChannelManager instantiateChannelManager(int channelMax, ThreadFactory threadFactory) {`
`20`		`- return new RecoveryAwareChannelManager(super._workService, channelMax);`
	`20`	`+ return new RecoveryAwareChannelManager(super._workService, channelMax, threadFactory);`
`21`	`21`	`}`
`22`	`22`	`}`