From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Fri, 7 Feb 2014 13:46:30 +0000 (+0200)
Subject: Merge changes from origin/7.1
X-Git-Tag: 7.2.0.beta1~178
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e8500a5af0c4924d4a164bbd548128cf474b203;p=vaadin-framework.git

Merge changes from origin/7.1

8245079 Decrease the websocket buffer size due to a Jetty 9.1 issue (#13087)
ea8f381 Show the widgetset name to more easily spot misconfigurations
797ebdf Allow user to override Atmosphere init params set by Vaadin (#13088)
65c2f2b Properly remove shadow event listeners to prevent IE8 memory leak (#13129)
e9a547a Fixed spelling mistake in log message.
0b95f8d Moved selection of selected rows in TableConnector to occur after the new rows are created (#13008)
0579fba Upload control with empty selection (#9602)
db4dba4 Ensure event listener is a widget before casting #13130
5e8e866 Changes padding for Textfields with Chameleon theme. (#12974)
171e68d Only use ClientRcp and ServerRpc types that are interfaces (#13056)
e41a2ce Add helper for adding multiple components to AbstractTestUI
407bdb3 Ignores scroll events while update from server is in progress (#11454)

Change-Id: I5d21b4071165b02da0f53bd055fb1c64e90cae5b
---

0e8500a5af0c4924d4a164bbd548128cf474b203
diff --cc server/src/com/vaadin/server/communication/PushRequestHandler.java
index 74595322a0,aff07d96d7..f3869a76f8
--- a/server/src/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/PushRequestHandler.java
@@@ -63,15 -64,17 +66,24 @@@ public class PushRequestHandler impleme
              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;
+             }
          };
  
 +        service.addServiceDestroyListener(new ServiceDestroyListener() {
 +            @Override
 +            public void serviceDestroy(ServiceDestroyEvent event) {
 +                destroy();
 +            }
 +        });
 +
          pushHandler = new PushHandler(service);
          atmosphere.addAtmosphereHandler("/*", pushHandler);
          atmosphere.addInitParameter(ApplicationConfig.PROPERTY_SESSION_SUPPORT,