Merge from 6.6

svn changeset:19412/svn branch:6.7

1 files changed, 17 insertions, 1 deletions

diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index d671dbc833..99de7a1352 100644
--- a/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -471,6 +471,9 @@ public class HierarchicalContainer extends IndexedContainer implements
             if (filteredChildren != null) {
                 filteredChildren = null;
             }
+            if (filteredParent != null) {
+                filteredParent = null;
+            }
         }
         enableAndFireContentsChangeEvents();
         return success;
@@ -516,18 +519,30 @@ public class HierarchicalContainer extends IndexedContainer implements
                 if (c != null) {
                     c.remove(itemId);
 
+                    if (c.isEmpty()) {
+                        children.remove(parentItemId);
+                    }
+
                     // Found in the children list so might also be in the
                     // filteredChildren list
                     if (filteredChildren != null) {
                         LinkedList<Object> f = filteredChildren
                                 .get(parentItemId);
                         if (f != null) {
-                            f.remove(parentItemId);
+                            f.remove(itemId);
+                            if (f.isEmpty()) {
+                                filteredChildren.remove(parentItemId);
+                            }
                         }
                     }
                 }
             }
             parent.remove(itemId);
+            if (filteredParent != null) {
+                // Item id no longer has a parent as the item id is not in the
+                // container.
+                filteredParent.remove(itemId);
+            }
             noChildrenAllowed.remove(itemId);
         }
 
@@ -642,6 +657,7 @@ public class HierarchicalContainer extends IndexedContainer implements
             // All filters removed
             filteredRoots = null;
             filteredChildren = null;
+            filteredParent = null;
 
             return super.doFilterContainer(hasFilters);
         }