diff options
| author | Artur Signell <artur@vaadin.com> | 2016-07-15 12:23:21 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-15 05:57:54 +0000 |
| commit | 4348979a9d429668a34282322f7c0b6a479835c9 (patch) | |
| tree | 3174c1b49298d07ec773d566b22ed1b44f1c5078 | |
| parent | d638d8138b886e6bdebaed01a0f4dc7295d8bb36 (diff) | |
| download | vaadin-framework-4348979a9d429668a34282322f7c0b6a479835c9.tar.gz vaadin-framework-4348979a9d429668a34282322f7c0b6a479835c9.zip | |
Prevent Atmosphere from resurrecting a destroyed broadcaster (#20026)
Change-Id: Ic67aede24b4d97f6d5c6ba64f485d3062d42d55a
| -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 92329d9468..30fec35084 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java @@ -207,6 +207,11 @@ public class PushRequestHandler 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"); |