Fix for #4215 and #4216 for ContainerHierarchicalWrapper

svn changeset:11478/svn branch:6.3

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 6420aaf838..72d6962736 100644
--- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -217,7 +217,12 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
             return ((Container.Hierarchical) container)
                     .areChildrenAllowed(itemId);
         }
-        return !noChildrenAllowed.contains(itemId);
+
+        if (noChildrenAllowed.contains(itemId)) {
+            return false;
+        }
+
+        return containsId(itemId);
     }
 
     /*
@@ -281,7 +286,11 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
             return ((Container.Hierarchical) container).isRoot(itemId);
         }
 
-        return parent.get(itemId) == null;
+        if (parent.containsKey(itemId)) {
+            return false;
+        }
+
+        return containsId(itemId);
     }
 
     /*