From 797ebdff7c1cb5c0d58910f3ff6e86bbdb91ea0a Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Mon, 16 Dec 2013 13:56:19 +0200
Subject: Allow user to override Atmosphere init params set by Vaadin (#13088)

Change-Id: Iea7c7978240f79cb7c9586b472e94da53d625ba7
---
 .../vaadin/server/communication/PushRequestHandler.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/server/communication/PushRequestHandler.java b/server/src/com/vaadin/server/communication/PushRequestHandler.java
index 8d0da24896..aff07d96d7 100644
--- a/server/src/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/PushRequestHandler.java
@@ -18,6 +18,7 @@ package com.vaadin.server.communication;
 
 import java.io.IOException;
 
+import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
 import org.atmosphere.client.TrackMessageSizeInterceptor;
@@ -56,11 +57,22 @@ public class PushRequestHandler implements RequestHandler,
     public PushRequestHandler(VaadinServletService service)
             throws ServiceException {
 
+        final ServletConfig config = service.getServlet().getServletConfig();
+
         atmosphere = new AtmosphereFramework() {
             @Override
             protected void analytics() {
                 // Overridden to disable version number check
             }
+
+            @Override
+            public AtmosphereFramework addInitParameter(String name,
+                    String value) {
+                if (config.getInitParameter(name) == null) {
+                    super.addInitParameter(name, value);
+                }
+                return this;
+            }
         };
 
         pushHandler = new PushHandler(service);
@@ -84,7 +96,7 @@ public class PushRequestHandler implements RequestHandler,
                 "false");
 
         try {
-            atmosphere.init(service.getServlet().getServletConfig());
+            atmosphere.init(config);
 
             // Ensure the client-side knows how to split the message stream
             // into individual messages when using certain transports
-- 
cgit v1.2.3