From fc4de0aba7707e84ce66d7ed52daef4e40122439 Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Wed, 9 Feb 2011 08:47:49 +0000
Subject: [PATCH] #6418 - Reverted change that broke multi-tab support

svn changeset:17236/svn branch:6.4
---
 .../gwt/server/AbstractCommunicationManager.java         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index cd46afb1cd..a89fdb838a 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1515,6 +1515,9 @@ public abstract class AbstractCommunicationManager implements
 
             // Get the path from URL
             String path = callback.getRequestPathInfo(request);
+            if (path != null && path.startsWith("/UIDL")) {
+                path = path.substring("/UIDL".length());
+            }
 
             // If the path is specified, create name from it
             if (path != null && path.length() > 0 && !path.equals("/")) {
@@ -1687,7 +1690,7 @@ public abstract class AbstractCommunicationManager implements
                     }
                     if (componentsRoot.getParent() != null) {
                         // this is a subwindow
-                        componentsRoot = (Window) componentsRoot.getParent();
+                        componentsRoot = componentsRoot.getParent();
                     }
                     if (componentsRoot != w) {
                         resultset.remove(p);
@@ -1927,7 +1930,7 @@ public abstract class AbstractCommunicationManager implements
         }
     }
 
-    private HashMap<Class<? extends Paintable>, Integer> typeToKey = new HashMap<Class<? extends Paintable>, Integer>();
+    private final HashMap<Class<? extends Paintable>, Integer> typeToKey = new HashMap<Class<? extends Paintable>, Integer>();
     private int nextTypeKey = 0;
 
     String getTagForType(Class<? extends Paintable> class1) {
@@ -1947,7 +1950,7 @@ public abstract class AbstractCommunicationManager implements
      */
     class OpenWindowCache implements Serializable {
 
-        private Set<Object> res = new HashSet<Object>();
+        private final Set<Object> res = new HashSet<Object>();
 
         /**
          * 
-- 
2.39.5