This is related QPID-1479

This commit contains the modifications for using the thread abstraction within MINA.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@734214 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 25 insertions, 3 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/QpidThreadExecutor.java b/java/client/src/main/java/org/apache/qpid/client/transport/QpidThreadExecutor.java
new file mode 100644
index 0000000000..3de410fb69
--- /dev/null
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/QpidThreadExecutor.java
@@ -0,0 +1,22 @@
+package org.apache.qpid.client.transport;
+
+import org.apache.qpid.thread.Threading;
+
+import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+
+public class QpidThreadExecutor implements Executor
+{
+    @Override
+    public void execute(Runnable command)
+    {
+        try
+        {
+            Threading.getThreadFactory().createThread(command).start();
+        }
+        catch(Exception e)
+        {
+            throw new RuntimeException("Error creating a thread using Qpid thread factory",e);
+        }
+    }
+
+}
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index 6c12821c74..0bacda04ff 100644
--- a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
@@ -91,7 +91,7 @@ public class TransportConnection
                 {
                     public IoConnector newSocketConnector()
                     {
-                        return new ExistingSocketConnector();
+                        return new ExistingSocketConnector(1,new QpidThreadExecutor());
                     }
                 });
             case TCP:
@@ -106,12 +106,12 @@ public class TransportConnection
                             _logger.warn("Using Qpid MultiThreaded NIO - " + (System.getProperties().containsKey("qpidnio")
                                                                               ? "Qpid NIO is new default"
                                                                               : "Sysproperty 'qpidnio' is set"));
-                            result = new MultiThreadSocketConnector();
+                            result = new MultiThreadSocketConnector(1, new QpidThreadExecutor());
                         }
                         else
                         {
                             _logger.info("Using Mina NIO");
-                            result = new SocketConnector(); // non-blocking connector
+                            result = new SocketConnector(1, new QpidThreadExecutor()); // non-blocking connector
                         }
                         // Don't have the connector's worker thread wait around for other connections (we only use
                         // one SocketConnector per connection at the moment anyway). This allows short-running