svn commit: r475297 - /incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java

[ritchiem]

Author: ritchiem
Date: Wed Nov 15 08:21:02 2006
New Revision: 475297

URL: http://svn.apache.org/viewvc?view=rev&rev=475297
Log:
Removed local development code that made it into the repository

Modified:
    incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java?view=diff&rev=475297&r1=475296&r2=475297
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java 
(original)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/Main.java 
Wed Nov 15 08:21:02 2006
@@ -320,19 +320,7 @@
 
             SocketSessionConfig sc;
 
-            //fixme improve get to use configuration
-            if (connectorConfig.qpidNIO)
-            {
-                //FIXME - this needs to be sorted to use the new Mina 
MultiThread SA.
-                _logger.warn("Using Qpid NIO - DISABLED");
-                //sconfig = 
(org.apache.mina.transport.socket.nio.MultiThreadSocketAcceptorConfig) 
acceptor.getDefaultConfig();
-                //sc = (SocketSessionConfig) sconfig.getSessionConfig();
-            }
-//            else
-            {
-                _logger.warn("Using Mina NIO");
-                sc = (SocketSessionConfig) acceptor.getSessionConfig();
-            }
+            sc = (SocketSessionConfig) acceptor.getSessionConfig();
 
             sc.setReceiveBufferSize(connectorConfig.socketReceiveBufferSize);
             sc.setSendBufferSize(connectorConfig.socketWriteBuferSize);