1 files changed, 3 insertions, 5 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
index a57ebc5c46..ecd699ef1b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.transport.network.mina;
 
 import static org.apache.qpid.transport.util.Functions.*;
+import static org.apache.qpid.configuration.ClientProperties.*;
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IdleStatus;
@@ -46,9 +47,6 @@ public class MinaNetworkHandler extends IoHandlerAdapter
 {
     private static final Logger _log = LoggerFactory.getLogger(MinaNetworkHandler.class);
     
-    /** Default buffer size for pending messages reads */
-    private static final String DEFAULT_READ_BUFFER_LIMIT = "262144";
-    
     private NetworkTransport _transport = null;
     private SSLContextFactory _sslFactory = null;
     private ReceiverFactory _factory = null;
@@ -117,12 +115,12 @@ public class MinaNetworkHandler extends IoHandlerAdapter
         }
         
         // Add IO Protection Read Filter
-        if (Boolean.getBoolean("qpid.protectio"))
+        if (Boolean.getBoolean(PROTECTIO_PROP_NAME))
         {
             try
             {
                 ReadThrottleFilterBuilder readFilter = new ReadThrottleFilterBuilder();
-                readFilter.setMaximumConnectionBufferSize(Integer.parseInt(System.getProperty("qpid.read.buffer.limit", DEFAULT_READ_BUFFER_LIMIT)));
+                readFilter.setMaximumConnectionBufferSize(Integer.getInteger(READ_BUFFER_LIMIT_PROP_NAME, READ_BUFFER_LIMIT_DEFAULT));
                 readFilter.attach(chain);
                 _log.info("Using IO Read/Write Filter Protection");
             }