diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2010-01-11 16:11:12 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2010-01-11 16:11:12 +0000 |
| commit | fd6d92c5fb399654fe65fb16d083c785f88dadb9 (patch) | |
| tree | c87b27181cb42931198f6b8203c8d4c8db649543 /qpid/java/common | |
| parent | e1d5ad015d274ea6206e2b6dcf43611b0b801035 (diff) | |
| download | qpid-python-fd6d92c5fb399654fe65fb16d083c785f88dadb9.tar.gz | |
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@897922 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java index bd03c3e242..09d91ae6c6 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java +++ b/qpid/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; } |