Changeset 8321

Timestamp:

07/04/09 07:29:33 (14 months ago)

Author:

artur.signell@…

Message:

Fix for #3115 - A new session should not be created if an application is not

Files:

• versions/6.0/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java (modified) (8 diffs)

versions/6.0/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

@@ -548 +548 @@
     private Application findApplicationInstance(HttpServletRequest request,
             RequestType requestType) throws MalformedURLException,
-            SAXException, IllegalAccessException, InstantiationException,
             ServletException, SessionExpired {
 
-        final boolean restartApplication = (request
-                .getParameter(URL_PARAMETER_RESTART_APPLICATION) != null);
-        final boolean closeApplication = (request
-                .getParameter(URL_PARAMETER_CLOSE_APPLICATION) != null);
-
-        Application application = getExistingApplication(request);
+        boolean requestCanCreateApplication = requestCanCreateApplication(
+                request, requestType);
+
+        /* Find an existing application for this request. */
+        Application application = getExistingApplication(request,
+                requestCanCreateApplication);
+
         if (application != null) {
             /*
@@ -562 +562 @@
              * user not specifically requested to close or restart it.
              */
+
+            final boolean restartApplication = (request
+                    .getParameter(URL_PARAMETER_RESTART_APPLICATION) != null);
+            final boolean closeApplication = (request
+                    .getParameter(URL_PARAMETER_CLOSE_APPLICATION) != null);
+
             if (restartApplication) {
                 closeApplication(application, request.getSession(false));
@@ -574 +580 @@
 
         // No existing application was found
+
+        if (requestCanCreateApplication) {
+            /*
+             * If the request is such that it should create a new application if
+             * one as not found, we do that.
+             */
+            return createApplication(request);
+        } else {
+            /*
+             * The application was not found and a new one should not be
+             * created. Assume the session has expired.
+             */
+            throw new SessionExpired();
+        }
+
+    }
+
+    /**
+     * Check if the request should create an application if an existing
+     * application is not found.
+     * 
+     * @param request
+     * @param requestType
+     * @return true if an application should be created, false otherwise
+     */
+    private boolean requestCanCreateApplication(HttpServletRequest request,
+            RequestType requestType) {
         if (requestType == RequestType.UIDL && isRepaintAll(request)) {
             /*
@@ -580 +613 @@
              * without using writeAjaxPage.
              */
-            return createApplication(request);
+            return true;
 
         } else if (requestType == RequestType.OTHER) {
             /*
-             * TODO Shouldany request really create a new application instance
-             * if none was found?
+             * TODO Should any URL request really create a new application
+             * instance if none was found?
              */
-            return createApplication(request);
-
-        } else {
-            /* The application was not found. Assume the session has expired. */
-            throw new SessionExpired();
-        }
-
+            return true;
+
+        }
+
+        return false;
     }
 
@@ -1589 +1620 @@
             servletPath = servletPath + "/";
         }
+        System.out.println(request.getPathInfo());
         URL u = new URL(reqURL, servletPath);
         return u;
@@ -1599 +1631 @@
      * @param request
      *            the HTTP request.
+     * @param allowSessionCreation
+     *            true if a session should be created if no session exists,
+     *            false if no session should be created
      * @return Application instance, or null if the URL does not map to valid
      *         application.
@@ -1607 +1642 @@
      * @throws IllegalAccessException
      * @throws InstantiationException
-     */
-    private Application getExistingApplication(HttpServletRequest request)
-            throws MalformedURLException, SAXException, IllegalAccessException,
-            InstantiationException {
+     * @throws SessionExpired
+     */
+    private Application getExistingApplication(HttpServletRequest request,
+            boolean allowSessionCreation) throws MalformedURLException,
+            SessionExpired {
 
         // Ensures that the session is still valid
-        final HttpSession session = request.getSession(true);
+        final HttpSession session = request.getSession(allowSessionCreation);
+        if (session == null) {
+            throw new SessionExpired();
+        }
 
         WebApplicationContext context = WebApplicationContext
@@ -1619 +1658 @@
 
         // Gets application list for the session.
-        final Collection applications = context.getApplications();
+        final Collection<Application> applications = context.getApplications();
 
         // Search for the application (using the application URI) from the list
-        for (final Iterator i = applications.iterator(); i.hasNext();) {
-            final Application sessionApplication = (Application) i.next();
+        for (final Iterator<Application> i = applications.iterator(); i
+                .hasNext();) {
+            final Application sessionApplication = i.next();
             final String sessionApplicationPath = sessionApplication.getURL()
                     .getPath();