Merging from trunk r1616861:1617235 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620330 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 11 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
index 1e0d5b9698..82a677b8f7 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
@@ -20,18 +20,19 @@
  */
 package org.apache.qpid.transport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static org.apache.qpid.transport.Connection.State.OPEN;
 
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * ServerDelegate
  */
@@ -136,12 +137,14 @@ public class ServerDelegate extends ConnectionDelegate
 
     protected void tuneAuthorizedConnection(final Connection conn)
     {
-        conn.connectionTune
-            (getChannelMax(),
-             org.apache.qpid.transport.network.ConnectionBinding.MAX_FRAME_SIZE,
-             0, getHeartbeatMax());
+        conn.connectionTune(getChannelMax(), getFrameMax(), 0, getHeartbeatMax());
     }
-    
+
+    protected int getFrameMax()
+    {
+        return org.apache.qpid.transport.network.ConnectionBinding.MAX_FRAME_SIZE;
+    }
+
     protected void secure(final Connection conn, final byte[] response)
     {
         final SaslServer ss = conn.getSaslServer();