summaryrefslogtreecommitdiff
path: root/java/common
diff options
context:
space:
mode:
Diffstat (limited to 'java/common')
-rw-r--r--java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java7
1 files changed, 6 insertions, 1 deletions
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;
}