diff options
| author | Artur Signell <artur@vaadin.com> | 2016-07-15 12:23:21 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-08-16 09:50:49 +0300 |
| commit | 290807fa8bda8f4f54e48ebccfbeba33f2a68be2 (patch) | |
| tree | ffd5c446e3007a8b8e2b99d7290e6d5bea290dfb | |
| parent | 352fac6c21bd8afaa4289acb26cec325ad92604f (diff) | |
| download | vaadin-framework-7.7.0.rc1.tar.gz vaadin-framework-7.7.0.rc1.zip | |
Prevent Atmosphere from resurrecting a destroyed broadcaster (#20026)7.7.0.rc1
Change-Id: Ifdf6d8f61eb1f5f19736e057e9314b400d6030ee
| -rw-r--r-- | server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java | 5 |
1 files changed, 5 insertions, 0 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 84b81c8963..17f7243e36 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java @@ -211,6 +211,11 @@ public class PushRequestHandler implements RequestHandler, atmosphere.addInitParameter( ApplicationConfig.PROPERTY_ALLOW_SESSION_TIMEOUT_REMOVAL, "false"); + // This prevents Atmosphere from recreating a broadcaster after it has + // already been destroyed when the servlet is being undeployed + // (see #20026) + atmosphere.addInitParameter(ApplicationConfig.RECOVER_DEAD_BROADCASTER, + "false"); // Disable Atmosphere's message about commercial support atmosphere.addInitParameter("org.atmosphere.cpr.showSupportMessage", "false"); |