Prevent Atmosphere from resurrecting a destroyed broadcaster (#20026)

Change-Id: Ifdf6d8f61eb1f5f19736e057e9314b400d6030ee

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 84b81c8963603ee0cf284780dd1cd2341f0d1ed8..17f7243e3627529c329bee83fad8729f321321a1 100644 (file)
--- 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");