1 files changed, 6 insertions, 1 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 5af2d4d1b3..3bd5c7fe0d 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
@@ -117,7 +117,7 @@ public class ServerDelegate extends ConnectionDelegate
                 conn.connectionTune
                     (Integer.MAX_VALUE,
                      org.apache.qpid.transport.network.ConnectionBinding.MAX_FRAME_SIZE,
-                     0, Integer.MAX_VALUE);
+                     0, getHeartbeatMax());
                 conn.setAuthorizationID(ss.getAuthorizationID());
             }
             else
@@ -132,6 +132,11 @@ public class ServerDelegate extends ConnectionDelegate
         }
     }
 
+    protected int getHeartbeatMax()
+    {
+        return Integer.MAX_VALUE;
+    }
+
     @Override public void connectionSecureOk(Connection conn, ConnectionSecureOk ok)
     {
         secure(conn, ok.getResponse());