From c18b0534cc2244fc52e3c9cb63543e090a777831 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 8 Nov 2007 08:06:31 +0000 Subject: [PATCH] fixes #1095 svn changeset:2747/svn branch:trunk --- .../terminal/gwt/server/ApplicationServlet.java | 6 ++++++ .../terminal/gwt/server/CommunicationManager.java | 12 +----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 5a3e2c343e..cf47e3ff1c 100644 --- 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 bb4e76c099..02505f25e8 100644 --- 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); -- 2.39.5