summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Valli <juuso@vaadin.com>2014-07-18 10:34:25 +0300
committerBogdan Udrescu <bogdan@vaadin.com>2014-07-23 14:13:13 +0300
commit8008df469e3f17233eb19394c3db36585bc9eafb (patch)
tree45562eb31728a2a37bc061e5f4b69fa02e895740
parentffb4594d8ff6b03b8e1392f5c47d814e408c9a45 (diff)
downloadvaadin-framework-8008df469e3f17233eb19394c3db36585bc9eafb.tar.gz
vaadin-framework-8008df469e3f17233eb19394c3db36585bc9eafb.zip
Fix web.xml element order issue (#14257)
In some servlet definitions async-supported was before init-param Change-Id: I2d4886a0aa4c37bad3b0385e25b51e91d59a4c31
-rw-r--r--WebContent/WEB-INF/web.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index fb2ddbd998..9ca5be2bdf 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -118,11 +118,11 @@
<param-name>pushmode</param-name>
<param-value>automatic</param-value>
</init-param>
- <async-supported>true</async-supported>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
+ <async-supported>true</async-supported>
</servlet>
<!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
@@ -133,11 +133,11 @@
<param-name>UI</param-name>
<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
</init-param>
- <async-supported>true</async-supported>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
+ <async-supported>true</async-supported>
</servlet>
<servlet-mapping>