fixes #4292 for ContainerHierarchicalWrapper

svn changeset:11728/svn branch:6.3

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index e692f11498..03be24b669 100644
--- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -181,6 +181,14 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      */
     private void removeFromHierarchyWrapper(Object itemId) {
 
+        LinkedList<Object> oprhanedChildren = children.remove(itemId);
+        if (oprhanedChildren != null) {
+            for (Object object : oprhanedChildren) {
+                // make orphaned children root nodes
+                setParent(object, null);
+            }
+        }
+
         if (isRoot(itemId)) {
             roots.remove(itemId);
         }
@@ -192,7 +200,6 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
             }
         }
         parent.remove(itemId);
-        children.remove(itemId);
         noChildrenAllowed.remove(itemId);
     }