From 290807fa8bda8f4f54e48ebccfbeba33f2a68be2 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 15 Jul 2016 12:23:21 +0300
Subject: [PATCH] Prevent Atmosphere from resurrecting a destroyed broadcaster
 (#20026)

Change-Id: Ifdf6d8f61eb1f5f19736e057e9314b400d6030ee
---
 .../com/vaadin/server/communication/PushRequestHandler.java  | 5 +++++
 1 file changed, 5 insertions(+)

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");
-- 
2.39.5