summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java5
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");