Revert merge from 6.8 fixing #8238 since it was causing issues like #11026. Should...

Change-Id: I232f55781daf7ab5137f9602d3a3c6c2020c6064

diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index 9944ec5308d4cc930e093a24e987a1ac8831dfff..283bc1b63bd19f1743ae7f475f6d34aa3bf1ff6f 100644 (file)
--- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
@@ -89,6 +89,14 @@ public abstract class TabsheetBaseConnector extends
             }
         }
 
+        // Detach any old tab widget, should be max 1
+        for (Iterator<Widget> iterator = oldWidgets.iterator(); iterator
+                .hasNext();) {
+            Widget oldWidget = iterator.next();
+            if (oldWidget.isAttached()) {
+                oldWidget.removeFromParent();
+            }
+        }
     }
 
     @Override