diff options
| author | Rupert Smith <rupertlssmith@apache.org> | 2007-12-18 14:52:25 +0000 |
|---|---|---|
| committer | Rupert Smith <rupertlssmith@apache.org> | 2007-12-18 14:52:25 +0000 |
| commit | f206f2594eb78b0568d7588d3c8bfadc9e4a1794 (patch) | |
| tree | c3f2f75699d0d08be20b90bb276eb772b7f333d1 | |
| parent | 0a2b53079f43969f428ed0e2148cdf4c612b2119 (diff) | |
| download | qpid-python-f206f2594eb78b0568d7588d3c8bfadc9e4a1794.tar.gz | |
Multi threaded io commented out until all issues with it are resolved.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@605217 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java | 4 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java index 1dcbb02d5c..97b186ffad 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java @@ -100,7 +100,9 @@ public class ConnectorConfiguration 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()); 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 49d528a4f4..ca8beeaf47 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 @@ -94,8 +94,10 @@ public class TransportConnection 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" |