From 0e3409bba51d10a80947baca273be5645c4a6a51 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 22 Feb 2010 15:26:21 +0000
Subject: [PATCH] Fix for #4215 - HierarchicalContainer.isRoot returns true for
 items not in container

svn changeset:11466/svn branch:6.3
---
 src/com/vaadin/data/util/HierarchicalContainer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);
     }
 
     /*
-- 
2.39.5