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

3 files changed, 0 insertions, 40 deletions

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 @@
     </management>
     <advanced>
         <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
         <enableJMSXUserID>false</enableJMSXUserID>
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