aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorPetter Holmström <petter.holmstrom@outlook.com>2018-09-06 16:19:19 +0300
committerIlia Motornyi <elmot@vaadin.com>2018-09-06 16:19:19 +0300
commit99161a6e91ab0c40a14256393047ac426cc1c4e3 (patch)
treedd3137e98d976996a658f26e380218aa373c85d1 /server
parent5a24c4865519be892b33a412e26326bc58f9cf0a (diff)
downloadvaadin-framework-99161a6e91ab0c40a14256393047ac426cc1c4e3.tar.gz
vaadin-framework-99161a6e91ab0c40a14256393047ac426cc1c4e3.zip
Re-enable the Atmosphere heartbeat interceptor (#9877)
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
index 178347fdf2..0c8fa544b6 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
@@ -181,11 +181,6 @@ public class PushRequestHandler implements SessionExpiredHandler {
atmosphere.addInitParameter(
ApplicationConfig.DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER,
"false");
- // Disable heartbeat (it does not emit correct events client side)
- // https://github.com/Atmosphere/atmosphere-javascript/issues/141
- atmosphere.addInitParameter(
- ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTORS,
- HeartbeatInterceptor.class.getName());
final String bufferSize = String
.valueOf(PushConstants.WEBSOCKET_BUFFER_SIZE);