You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/12/18 15:52:26 UTC
svn commit: r605217 - in /incubator/qpid/branches/M2.1.1/java:
broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Author: rupertlssmith
Date: Tue Dec 18 06:52:25 2007
New Revision: 605217
URL: http://svn.apache.org/viewvc?rev=605217&view=rev
Log:
Multi threaded io commented out until all issues with it are resolved.
Modified:
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Modified: incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java?rev=605217&r1=605216&r2=605217&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java (original)
+++ incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java Tue Dec 18 06:52:25 2007
@@ -100,7 +100,9 @@
public IoAcceptor createAcceptor()
{
- if (_multiThreadNIO)
+ // Multi-threaded io commented out until all issues with it are resolved.
+ //if (_multiThreadNIO)
+ if (false)
{
_logger.warn("Using Qpid Multithreaded IO Processing");
return new org.apache.mina.transport.socket.nio.MultiThreadSocketAcceptor(processors, new NewThreadExecutor());
Modified: incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?rev=605217&r1=605216&r2=605217&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java Tue Dec 18 06:52:25 2007
@@ -94,8 +94,10 @@
public IoConnector newSocketConnector()
{
SocketConnector result;
+ // Multi-threaded io commented out until all issues with it are fixed.
// FIXME - this needs to be sorted to use the new Mina MultiThread SA.
- if (!System.getProperties().containsKey("qpidnio") || Boolean.getBoolean("qpidnio"))
+ //if (!System.getProperties().containsKey("qpidnio") || Boolean.getBoolean("qpidnio"))
+ if (false)
{
_logger.warn("Using Qpid MultiThreaded NIO - " + (System.getProperties().containsKey("qpidnio")
? "Qpid NIO is new default"