fixes #1095

svn changeset:2747/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 5a3e2c343ecf5df2fc38c1840b2f73ca6c48bc9d..cf47e3ff1c54ccf5fa862558a91730a233e5d913 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -385,6 +385,12 @@ public class ApplicationServlet extends HttpServlet {
                                if (handleResourceRequest(request, response, themeName))
                                        return;
 
+                               // Handle parameters
+                               Map parameters = request.getParameterMap();
+                               if (window != null && parameters != null
+                                               && !parameters.isEmpty())
+                                       window.handleParameters(parameters);
+
                                writeAjaxPage(request, response, window, themeName);
                        }
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index bb4e76c09910eebb1d81e51602980b73b392eba9..02505f25e8e3cde49e950e6e7dff71de3185571c 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -265,11 +265,7 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                        synchronized (application) {
 
                                // Change all variables based on request parameters
-                               Map unhandledParameters = handleVariables(request, application);
-
-                               // Handles the URI if the application is still running
-                               if (application.isRunning())
-                                       download = handleURI(application, request, response);
+                               handleVariables(request, application);
 
                                // If this is not a download request
                                if (download == null) {
@@ -279,12 +275,6 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                                        if (application.isRunning())
                                                window = getApplicationWindow(request, application);
 
-                                       // Handles the unhandled parameters if the application is
-                                       // still running
-                                       if (window != null && unhandledParameters != null
-                                                       && !unhandledParameters.isEmpty())
-                                               window.handleParameters(unhandledParameters);
-
                                        // Removes application if it has stopped
                                        if (!application.isRunning()) {
                                                endApplication(request, response, application);