Initial migration of ajax page generation to a RequestHandler (#7888)

1 files changed, 3 insertions, 10 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 94cd543a9b..d78c49c61c 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -521,6 +521,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 // Handles AJAX UIDL requests
                 Root root = applicationManager.getApplicationRoot(
                         wrappedRequest, application);
+                if (root == null) {
+                    throw new ServletException(ERROR_NO_WINDOW_FOUND);
+                }
                 applicationManager.handleUidlRequest(wrappedRequest,
                         wrappedResponse, servletWrapper, root);
                 return;
@@ -539,16 +542,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             }
             // TODO Should return 404 error here and not do anything more
 
-            // Finds the root within the application
-            Root root = applicationManager.getApplicationRoot(wrappedRequest,
-                    application);
-            if (root == null) {
-                throw new ServletException(ERROR_NO_WINDOW_FOUND);
-            }
-
-            // Send initial AJAX page that kickstarts a Vaadin application
-            writeAjaxPage(request, response, root, application);
-
         } catch (final SessionExpiredException e) {
             // Session has expired, notify user
             handleServiceSessionExpired(request, response);