From 3df4bbbe0199146286a2d00345116584e6daf886 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 6 Jun 2011 15:13:14 +0000
Subject: #7129 Properly clean up "filteredParent" when removing an item from a
 filtered container

svn changeset:19245/svn branch:6.6
---
 src/com/vaadin/data/util/HierarchicalContainer.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/com/vaadin/data')

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);
         }
 
-- 
cgit v1.2.3