diff options
| -rw-r--r-- | server/src/com/vaadin/server/DefaultUIProvider.java | 8 |
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(); |