QPID-18. Removed unused experimental code that had direct dependencies on MINA-0.9.5 and upgraded to MINA-1.1.0 snapshot.

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

1 files changed, 3 insertions, 13 deletions

diff --git a/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java b/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
index e9e9c8aca4..6470d876bb 100644
--- a/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ b/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
@@ -19,6 +19,8 @@ package org.apache.qpid.server.transport;
 
 import org.apache.qpid.configuration.Configured;
 import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.filter.executor.ExecutorExecutor;
+import org.apache.mina.util.NewThreadExecutor;
 
 public class ConnectorConfiguration
 {
@@ -74,20 +76,8 @@ public class ConnectorConfiguration
                 defaultValue = "true")
     public boolean enableNonSSL;
 
-    @Configured(path = "advanced.useBlockingIo",
-                defaultValue = "false")
-    public boolean useBlockingIo;
-
     public IoAcceptor createAcceptor()
     {
-        if(useBlockingIo)
-        {
-            System.out.println("Using blocking io");
-            return new org.apache.qpid.bio.SocketAcceptor();
-        }
-        else
-        {
-            return new org.apache.mina.transport.socket.nio.SocketAcceptor(processors);
-        }
+        return new org.apache.mina.transport.socket.nio.SocketAcceptor(processors, new NewThreadExecutor());     
     }
 }