You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/05/03 15:15:14 UTC
[1/2] activemq-artemis git commit: This closes #497
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7d0d77999 -> b863e69eb
This closes #497
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b863e69e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b863e69e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b863e69e
Branch: refs/heads/master
Commit: b863e69eb77369e6ff82a049606371a5f1337300
Parents: 7d0d779 75a4e78
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue May 3 14:14:34 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue May 3 14:14:34 2016 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: Change keep alive ratio to 1.5
from 0.75
Posted by ma...@apache.org.
Change keep alive ratio to 1.5 from 0.75
Fixes: ARTEMIS-397
>From mqtt specs:
\u201cIf the Keep Alive value is non-zero and the Server does not receive a
Control Packet from the Client within one and a half times the Keep
Alive time period, it MUST disconnect the Network Connection to the
Client as if the network had failed [MQTT-3.1.2-24]. \u201c
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/75a4e789
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/75a4e789
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/75a4e789
Branch: refs/heads/master
Commit: 75a4e78948ba30e154bd0dafa86947052942ff47
Parents: 7d0d779
Author: Diego Bes <db...@TangoMe-Macbook-Pro.local>
Authored: Fri Apr 29 08:43:25 2016 -0700
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue May 3 14:14:34 2016 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/75a4e789/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
index 57c2b57..306d146 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
@@ -156,7 +156,7 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
*/
void handleConnect(MqttConnectMessage connect, ChannelHandlerContext ctx) throws Exception {
this.ctx = ctx;
- connectionEntry.ttl = connect.variableHeader().keepAliveTimeSeconds() * 750;
+ connectionEntry.ttl = connect.variableHeader().keepAliveTimeSeconds() * 1500;
String clientId = connect.payload().clientIdentifier();
session.getConnectionManager().connect(clientId, connect.payload().userName(), connect.payload().password(), connect.variableHeader().isWillFlag(), connect.payload().willMessage(), connect.payload().willTopic(), connect.variableHeader().isWillRetain(), connect.variableHeader().willQos(), connect.variableHeader().isCleanSession());