Fix for #4215 - HierarchicalContainer.isRoot returns true for items not in container

svn changeset:11466/svn branch:6.3

diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index f5b65f1dad9fb0f2bd9ee8e6f5072db671d90c35..f710e6d1fbea3b710d1327eb5124adf2992aad2b 100644 (file)
--- a/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -91,7 +91,11 @@ public class HierarchicalContainer extends IndexedContainer implements
      * interface.
      */
     public boolean isRoot(Object itemId) {
-        return parent.get(itemId) == null;
+        if (parent.containsKey(itemId)) {
+            return false;
+        }
+
+        return containsId(itemId);
     }
 
     /*