summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2014-02-07 15:46:30 +0200
committerJonatan Kronqvist <jonatan@vaadin.com>2014-02-07 15:46:30 +0200
commit0e8500a5af0c4924d4a164bbd548128cf474b203 (patch)
tree8453e88b1c777d0a4ac28e6cad9a61de16aed785 /shared
parent2659a54ebed8af66dce22b27d3ea285d1c8eb221 (diff)
parent407bdb39f7d87acaf15c399e46baf6d6a858fa6d (diff)
downloadvaadin-framework-0e8500a5af0c4924d4a164bbd548128cf474b203.tar.gz
vaadin-framework-0e8500a5af0c4924d4a164bbd548128cf474b203.zip
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
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/communication/PushConstants.java5
-rw-r--r--shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java26
2 files changed, 30 insertions, 1 deletions
diff --git a/shared/src/com/vaadin/shared/communication/PushConstants.java b/shared/src/com/vaadin/shared/communication/PushConstants.java
index f16cbb7390..4b4f247e5f 100644
--- a/shared/src/com/vaadin/shared/communication/PushConstants.java
+++ b/shared/src/com/vaadin/shared/communication/PushConstants.java
@@ -27,8 +27,11 @@ public class PushConstants implements Serializable {
/**
* The size, in <b>bytes</b>, of the receiving buffer used by some servers.
+ * <p>
+ * Should not be set to a value equal to or greater than 32768 due to a
+ * Jetty 9.1 issue (see #13087)
*/
- public static final int WEBSOCKET_BUFFER_SIZE = 65536;
+ public static final int WEBSOCKET_BUFFER_SIZE = 16384;
/**
* The maximum size, in <b>characters</b>, of a websocket message fragment.
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java b/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
new file mode 100644
index 0000000000..1757ddb001
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.shared.ui.upload;
+
+import com.vaadin.shared.communication.ClientRpc;
+
+public interface UploadClientRpc extends ClientRpc {
+
+ /**
+ * Forces the upload the send selected file to the server.
+ */
+ void submitUpload();
+}