summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-27 16:02:28 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-28 14:14:13 +0300
commit01ff5a924b8fdeeda8cbd21973fc1ecd206ef043 (patch)
tree3d2492e4a284a3ff5f5b278920cd490614238f56 /uitest/src/com/vaadin/launcher
parentea08980bf3686051b61705d3abb838b720ec8a4f (diff)
downloadvaadin-framework-01ff5a924b8fdeeda8cbd21973fc1ecd206ef043.tar.gz
vaadin-framework-01ff5a924b8fdeeda8cbd21973fc1ecd206ef043.zip
Use one VaadinSession per VaadinServlet (#9733)
Change-Id: I98639e88cc772e4370ebba836f270c44258613fa
Diffstat (limited to 'uitest/src/com/vaadin/launcher')
-rw-r--r--uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 05edc506a9..0269982963 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -141,7 +141,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
try {
final Class<?> classToRun = getClassToRun();
if (UI.class.isAssignableFrom(classToRun)) {
- getService().addUIProvider(session, new UIProvider() {
+ session.addUIProvider(new UIProvider() {
@Override
public Class<? extends UI> getUIClass(
UIClassSelectionEvent event) {
@@ -151,8 +151,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
} else if (LegacyApplication.class.isAssignableFrom(classToRun)) {
// Avoid using own UIProvider for legacy Application
} else if (UIProvider.class.isAssignableFrom(classToRun)) {
- getService().addUIProvider(session,
- (UIProvider) classToRun.newInstance());
+ session.addUIProvider((UIProvider) classToRun.newInstance());
} else {
throw new ServiceException(classToRun.getCanonicalName()
+ " is neither an Application nor a UI");