diff options
| author | Robert Greig <rgreig@apache.org> | 2006-10-12 20:01:58 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2006-10-12 20:01:58 +0000 |
| commit | 1584e435c256f108afd6691a6ea9e1f3ff4faf0b (patch) | |
| tree | e955f87b80a3ace60e5f88133c3c6b93172ebbab /qpid/java/broker | |
| parent | aacdf39382efc793b9b92bc99bc8ce18c21de8d8 (diff) | |
| download | qpid-python-1584e435c256f108afd6691a6ea9e1f3ff4faf0b.tar.gz | |
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@463403 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
3 files changed, 9 insertions, 14 deletions
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 77997a3685..78ac5747ea 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -33,7 +33,7 @@ <enabled>true</enabled> </management> <advanced> - <filterchain enableExecutorPool="true"/> + <filterchain enableExecutorPool="false"/> <enablePooledAllocator>false</enablePooledAllocator> <enableDirectBuffers>false</enableDirectBuffers> <framesize>65535</framesize> diff --git a/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java b/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java index e9e9c8aca4..6470d876bb 100644 --- a/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java +++ b/qpid/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()); } } diff --git a/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java b/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java index 101ba7dd36..f985050e9f 100644 --- a/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java +++ b/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java @@ -49,6 +49,11 @@ public class MockIoSession implements IoSession return null; //To change body of implemented methods use File | Settings | File Templates. } + public IoServiceConfig getServiceConfig() + { + return null; + } + public IoHandler getHandler() { return null; //To change body of implemented methods use File | Settings | File Templates. |