diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-01-21 15:55:44 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-01-21 15:55:44 +0000 |
| commit | 9f6ff547a00e2c5414c7de48ebf716b0adf26ba3 (patch) | |
| tree | af83e0d6c84b03e32d84e6cb82c993edf81280f2 /qpid/java/broker/src | |
| parent | 0433774657a2efdb4aa8b87c09cdbbdd0d08bd0c (diff) | |
| download | qpid-python-9f6ff547a00e2c5414c7de48ebf716b0adf26ba3.tar.gz | |
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@1061865 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src')
2 files changed, 0 insertions, 38 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index a0f5f9fa4c..c6a8818d90 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/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/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index ddebe28d03..718874cf69 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/qpid/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 |