From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 22 Feb 2010 15:26:21 +0000 (+0000)
Subject: Fix for #4215 - HierarchicalContainer.isRoot returns true for items not in container
X-Git-Tag: 6.7.0.beta1~2029
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e3409bba51d10a80947baca273be5645c4a6a51;p=vaadin-framework.git

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 f5b65f1dad..f710e6d1fb 100644
--- 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);
     }
 
     /*