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

1 files changed, 8 insertions, 8 deletions

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();