fixes #1451

svn changeset:3937/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index f83649037ed5cfcbf6b6d70b32731c7de41f6e0a..605bfd89bc1aff2ceb2fbfb7d2bc089493bdc007 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -418,6 +418,16 @@ public class ApplicationServlet extends HttpServlet {
                 return;
             }
 
+            // Finds the window within the application
+            Window window = null;
+            window = getApplicationWindow(request, application);
+
+            // Handle parameters
+            final Map parameters = request.getParameterMap();
+            if (window != null && parameters != null) {
+                window.handleParameters(parameters);
+            }
+
             // Is this a download request from application
             DownloadStream download = null;
 
@@ -427,17 +437,6 @@ public class ApplicationServlet extends HttpServlet {
             // If this is not a download request
             if (download == null) {
 
-                // TODO Clean this branch
-
-                // Window renders are not cacheable
-                response.setHeader("Cache-Control", "no-cache");
-                response.setHeader("Pragma", "no-cache");
-                response.setDateHeader("Expires", 0);
-
-                // Finds the window within the application
-                Window window = null;
-                window = getApplicationWindow(request, application);
-
                 // Sets terminal type for the window, if not already set
                 if (window.getTerminal() == null) {
                     window.setTerminal(browser);
@@ -454,17 +453,9 @@ public class ApplicationServlet extends HttpServlet {
                     return;
                 }
 
-                // Handle parameters
-                final Map parameters = request.getParameterMap();
-                if (window != null && parameters != null) {
-                    window.handleParameters(parameters);
-                }
-
                 writeAjaxPage(request, response, window, themeName, application);
-            }
 
-            // For normal requests, transform the window
-            if (download != null) {
+            } else {
                 handleDownload(download, request, response);
             }
 
@@ -641,6 +632,12 @@ public class ApplicationServlet extends HttpServlet {
     private void writeAjaxPage(HttpServletRequest request,
             HttpServletResponse response, Window window, String themeName,
             Application application) throws IOException, MalformedURLException {
+
+        // Window renders are not cacheable
+        response.setHeader("Cache-Control", "no-cache");
+        response.setHeader("Pragma", "no-cache");
+        response.setDateHeader("Expires", 0);
+
         response.setContentType("text/html");
         final BufferedWriter page = new BufferedWriter(new OutputStreamWriter(
                 response.getOutputStream()));