From db22374208796cbd1504640edca2b5bb6f083803 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Mon, 11 Jan 2010 16:11:12 +0000 Subject: This is a fix for QPID-2336 The fix allows an idle_timeout of zero to be set as the heartbeat interval with a warning message to say heartbeats are disabled. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@897922 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/transport/ClientDelegate.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/ClientDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java index bd03c3e242..09d91ae6c6 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java +++ b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java @@ -157,7 +157,12 @@ public class ClientDelegate extends ConnectionDelegate private int calculateHeartbeatInterval(Connection conn,int min, int max) { long l = conn.getIdleTimeout()/1000; - if (l !=0 && l >= min && l <= max) + if (l == 0) + { + log.warn("Idle timeout is zero. Heartbeats are disabled"); + return 0; // heartbeats are disabled. + } + else if (l >= min && l <= max) { return (int)l; } -- cgit v1.2.1