From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 17 Dec 2007 13:47:11 +0000 (+0000)
Subject: fixes #1233
X-Git-Tag: 6.7.0.beta1~5229
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ea3559e5a628ce2d59331442a1b7f860a9e4dfa;p=vaadin-framework.git

fixes #1233

svn changeset:3247/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 b6b0792a3f..f116ee25b7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -387,7 +387,17 @@ public class ApplicationServlet extends HttpServlet {
 
             // Get existing application
             application = getExistingApplication(request, response);
-            if (application == null) {
+            if (application == null
+                    || request.getParameter("restartApplication") != null) {
+                if (request.getParameter("restartApplication") != null
+                        && application != null) {
+                    application.close();
+                    final HttpSession session = request.getSession();
+                    if (session != null) {
+                        WebApplicationContext.getApplicationContext(session)
+                                .removeApplication(application);
+                    }
+                }
                 // Not found, creating new application
                 application = getNewApplication(request, response);
             }
@@ -723,9 +733,9 @@ public class ApplicationServlet extends HttpServlet {
         if (testingToolsServerUri == null) {
             // Default behavior is that ATFServer application exists on
             // same application server as current application does.
-            testingToolsServerUri = "http" + (request.isSecure() ? "s" : "") + "://"
-                    + request.getServerName() + ":" + request.getLocalPort()
-                    + "/ATF/ATFServer";
+            testingToolsServerUri = "http" + (request.isSecure() ? "s" : "")
+                    + "://" + request.getServerName() + ":"
+                    + request.getLocalPort() + "/ATF/ATFServer";
         }
         return testingToolsServerUri;
     }