From 6751861ecd65464ff12cc31e7dd583dccb847fb6 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 21 Jan 2011 15:55:44 +0000 Subject: QPID-3010: ensure the SimpleByteBufferAllocator is always used and non-direct ByteBuffers are the default, remove the old and now unused configuration methods from ServerConfiguration and update the example config.xml accordingly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061865 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/etc/config.xml | 2 -- .../server/configuration/ServerConfiguration.java | 10 -------- .../configuration/ServerConfigurationTest.java | 28 ---------------------- .../transport/network/mina/MINANetworkDriver.java | 16 ++++++------- 4 files changed, 8 insertions(+), 48 deletions(-) (limited to 'java') diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml index d9677c9cf6..14b9456067 100644 --- a/java/broker/etc/config.xml +++ b/java/broker/etc/config.xml @@ -62,8 +62,6 @@ - false - false 65535 false false diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index a0f5f9fa4c..c6a8818d90 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -704,16 +704,6 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa return getBooleanValue("advanced.filterchain[@enableExecutorPool]"); } - public boolean getEnablePooledAllocator() - { - return getBooleanValue("advanced.enablePooledAllocator"); - } - - public boolean getEnableDirectBuffers() - { - return getBooleanValue("advanced.enableDirectBuffers"); - } - public boolean getEnableSSL() { return getBooleanValue("connector.ssl.enabled"); diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index ddebe28d03..718874cf69 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -630,34 +630,6 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase assertEquals(true, serverConfig.getEnableExecutorPool()); } - public void testGetEnablePooledAllocator() throws ConfigurationException - { - // Check default - ServerConfiguration serverConfig = new ServerConfiguration(_config); - serverConfig.initialise(); - assertEquals(false, serverConfig.getEnablePooledAllocator()); - - // Check value we set - _config.setProperty("advanced.enablePooledAllocator", true); - serverConfig = new ServerConfiguration(_config); - serverConfig.initialise(); - assertEquals(true, serverConfig.getEnablePooledAllocator()); - } - - public void testGetEnableDirectBuffers() throws ConfigurationException - { - // Check default - ServerConfiguration serverConfig = new ServerConfiguration(_config); - serverConfig.initialise(); - assertEquals(false, serverConfig.getEnableDirectBuffers()); - - // Check value we set - _config.setProperty("advanced.enableDirectBuffers", true); - serverConfig = new ServerConfiguration(_config); - serverConfig.initialise(); - assertEquals(true, serverConfig.getEnableDirectBuffers()); - } - public void testGetEnableSSL() throws ConfigurationException { // Check default diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java index 1a2869a815..0f2c0d0226 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java @@ -83,6 +83,14 @@ public class MINANetworkDriver extends IoHandlerAdapter implements NetworkDriver private static final Logger _logger = LoggerFactory.getLogger(MINANetworkDriver.class); + static + { + org.apache.mina.common.ByteBuffer.setUseDirectBuffers(Boolean.getBoolean("amqj.enableDirectBuffers")); + + //override the MINA defaults to prevent use of the PooledByteBufferAllocator + org.apache.mina.common.ByteBuffer.setAllocator(new SimpleByteBufferAllocator()); + } + public MINANetworkDriver(boolean useNIO, int processors, boolean executorPool, boolean protectIO) { _useNIO = useNIO; @@ -209,14 +217,6 @@ public class MINANetworkDriver extends IoHandlerAdapter implements NetworkDriver // connector } - org.apache.mina.common.ByteBuffer.setUseDirectBuffers(Boolean.getBoolean("amqj.enableDirectBuffers")); - // the MINA default is currently to use the pooled allocator although this may change in future - // once more testing of the performance of the simple allocator has been done - if (!Boolean.getBoolean("amqj.enablePooledAllocator")) - { - org.apache.mina.common.ByteBuffer.setAllocator(new SimpleByteBufferAllocator()); - } - SocketConnectorConfig cfg = (SocketConnectorConfig) _socketConnector.getDefaultConfig(); String s = ""; StackTraceElement[] trace = Thread.currentThread().getStackTrace(); -- cgit v1.2.1