#7129 Properly clean up "filteredParent" when removing an item from a filtered container

svn changeset:19245/svn branch:6.6

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index d671dbc833..e208d07dc6 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;
@@ -528,6 +531,11 @@ public class HierarchicalContainer extends IndexedContainer implements
                 }
             }
             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);
         }