From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 10 Oct 2008 07:46:57 +0000 (+0000)
Subject: Don't pass "APP" to getWindow(). Fixes #2146
X-Git-Tag: 6.7.0.beta1~4001
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f162264298520b9602d44548f6abf666a0e6f1cb;p=vaadin-framework.git

Don't pass "APP" to getWindow(). Fixes #2146

svn changeset:5622/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 e8165f3ff9..8a56275d60 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -1486,7 +1486,8 @@ public class ApplicationServlet extends HttpServlet {
         }
 
         // Main window as the URI is empty
-        if (path == null || path.length() == 0 || path.equals("/")) {
+        if (path == null || path.length() == 0 || path.equals("/")
+                || path.startsWith("/APP/")) {
             window = application.getMainWindow();
         } else {
             String windowName = null;