From 4232ed70d43adf7f3135baf02535ad84bbf7fad5 Mon Sep 17 00:00:00 2001 From: jbertram Date: Wed, 20 Jul 2016 15:28:08 -0500 Subject: [PATCH] ARTEMIS-611 adjust ttlMin to fix Stomp tests --- .../artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java | 2 +- docs/user-manual/en/protocols-interoperability.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java index 6d713193f9..f9f60b9c03 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java @@ -269,7 +269,7 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements long ttlMax = ttlMaxStr == null ? Long.MAX_VALUE : Long.valueOf(ttlMaxStr); String ttlMinStr = (String) connection.getAcceptorUsed().getConfiguration().get(TransportConstants.CONNECTION_TTL_MIN); - long ttlMin = ttlMinStr == null ? 500 : Long.valueOf(ttlMinStr); + long ttlMin = ttlMinStr == null ? 1000 : Long.valueOf(ttlMinStr); String heartBeatToTtlModifierStr = (String) connection.getAcceptorUsed().getConfiguration().get(TransportConstants.HEART_BEAT_TO_CONNECTION_TTL_MODIFIER); double heartBeatToTtlModifier = heartBeatToTtlModifierStr == null ? 2 : Double.valueOf(heartBeatToTtlModifierStr); diff --git a/docs/user-manual/en/protocols-interoperability.md b/docs/user-manual/en/protocols-interoperability.md index 7e81e65409..ac620582a6 100644 --- a/docs/user-manual/en/protocols-interoperability.md +++ b/docs/user-manual/en/protocols-interoperability.md @@ -320,7 +320,7 @@ not to be considered late and trigger a disconnect. The minimum and maximum connection TTL allowed can also be specified on the acceptor via the `connectionTtlMin` and `connectionTtlMax` properties respectively. -The default `connectionTtlMin` is 500 and the default `connectionTtlMax` is Java's +The default `connectionTtlMin` is 1000 and the default `connectionTtlMax` is Java's `Long.MAX_VALUE` meaning there essentially is no max connection TTL by default. Keep in mind that the `heartBeatConnectionTtlModifer` is relevant here. For example, if a client sends a `heart-beat` header of `20000,0` and the acceptor