diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-09-26 22:34:40 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-09-26 22:34:40 +0000 |
| commit | a634b7970e2b4f6bc626cc402ef5c6f5289671cd (patch) | |
| tree | a4759293bc3e1aedded4c6147d52448638640d41 | |
| parent | dfb9cf780bf36455dbc40a684a75c8bccf981a94 (diff) | |
| download | qpid-python-a634b7970e2b4f6bc626cc402ef5c6f5289671cd.tar.gz | |
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
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java | 7 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java index 429e4b5976..a95f4e5c42 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java @@ -121,4 +121,11 @@ public class ServerConnectionDelegate extends ServerDelegate sconn.setState(Connection.State.CLOSING); } } + + @Override + protected int getHeartbeatMax() + { + //TODO: implement broker support for actually sending heartbeats + return 0; + } } 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()); |