summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-02 10:21:39 +0300
committerLeif Åstrand <leif@vaadin.com>2012-10-02 10:21:39 +0300
commit25b4d23647b1056097c2a4b2761bfe25d8928b7a (patch)
treeeb1334ffc92f17a2b4da8592e20be317ee875363
parent79338ff6c3de371cd7f6fca6aa4ce9449bccd6ee (diff)
downloadvaadin-framework-25b4d23647b1056097c2a4b2761bfe25d8928b7a.tar.gz
vaadin-framework-25b4d23647b1056097c2a4b2761bfe25d8928b7a.zip
Make DefaultUIProvider work with lower case parameter name (#9474)7.0.0.beta3
Change-Id: I1c66f1661fee32ce924f5923c15a5c86b25465e1
-rw-r--r--server/src/com/vaadin/server/DefaultUIProvider.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/server/src/com/vaadin/server/DefaultUIProvider.java b/server/src/com/vaadin/server/DefaultUIProvider.java
index 1652d39c3a..e02e5dc860 100644
--- a/server/src/com/vaadin/server/DefaultUIProvider.java
+++ b/server/src/com/vaadin/server/DefaultUIProvider.java
@@ -24,9 +24,11 @@ public class DefaultUIProvider extends UIProvider {
public Class<? extends UI> getUIClass(UIClassSelectionEvent event) {
VaadinRequest request = event.getRequest();
- Object uiClassNameObj = request.getService()
- .getDeploymentConfiguration().getInitParameters()
- .getProperty(VaadinServiceSession.UI_PARAMETER);
+ Object uiClassNameObj = request
+ .getService()
+ .getDeploymentConfiguration()
+ .getApplicationOrSystemProperty(
+ VaadinServiceSession.UI_PARAMETER, null);
if (uiClassNameObj instanceof String) {
String uiClassName = uiClassNameObj.toString();