From a634b7970e2b4f6bc626cc402ef5c6f5289671cd Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 26 Sep 2010 22:34:40 +0000 Subject: QPID-2872: make the broker indicate a heartbeat max of 0sec to cause the client disable heartbeating, as it otherwise enables the connection idle timeout by default and the broker cant generate them. Needed until QPID-2796 is undertaken to implement broker support for generating heartbeats. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1001544 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/transport/ServerDelegate.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java index 5af2d4d1b3..3bd5c7fe0d 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java +++ b/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()); -- cgit v1.2.1