summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-20 16:45:25 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-21 13:21:31 +0300
commitfedfc550e2beb5f996cfd4f78c14618b6a294315 (patch)
treea87d13751035e1c5fc7300e96601d720fc30cc05
parent8b28ea439cf09b69574009337c2659dd653d3760 (diff)
downloadvaadin-framework-fedfc550e2beb5f996cfd4f78c14618b6a294315.tar.gz
vaadin-framework-fedfc550e2beb5f996cfd4f78c14618b6a294315.zip
Remove some internal "application" references (#9402)
-rw-r--r--server/src/com/vaadin/server/ServletPortletHelper.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index 536af12239..efa3c62f6e 100644
--- a/server/src/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/server/ServletPortletHelper.java
@@ -117,21 +117,21 @@ class ServletPortletHelper implements Serializable {
ApplicationConstants.HEARTBEAT_REQUEST_PATH);
}
- public static void initDefaultUIProvider(VaadinSession application,
+ public static void initDefaultUIProvider(VaadinSession session,
VaadinService vaadinService) throws ServiceException {
String uiProperty = vaadinService.getDeploymentConfiguration()
.getInitParameters().getProperty(VaadinSession.UI_PARAMETER);
if (uiProperty != null) {
verifyUIClass(uiProperty, vaadinService.getClassLoader());
- application.addUIProvider(new DefaultUIProvider());
+ session.addUIProvider(new DefaultUIProvider());
}
}
- public static void checkUiProviders(VaadinSession newApplication)
+ public static void checkUiProviders(VaadinSession session)
throws ServiceException {
- if (newApplication.getUIProviders().isEmpty()) {
+ if (session.getUIProviders().isEmpty()) {
throw new ServiceException(
- "No UIProvider has been added to the application and there is no \""
+ "No UIProvider has been added and there is no \""
+ VaadinSession.UI_PARAMETER + "\" init parameter.");
}
}