aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-02-22 15:26:21 +0000
committerArtur Signell <artur.signell@itmill.com>2010-02-22 15:26:21 +0000
commit0e3409bba51d10a80947baca273be5645c4a6a51 (patch)
tree310be1b568ea20fe120f8278bbb5a742719c0349
parent7ed3dada20c602a1f9d171a07517c3832feec978 (diff)
downloadvaadin-framework-0e3409bba51d10a80947baca273be5645c4a6a51.tar.gz
vaadin-framework-0e3409bba51d10a80947baca273be5645c4a6a51.zip
Fix for #4215 - HierarchicalContainer.isRoot returns true for items not in container
svn changeset:11466/svn branch:6.3
-rw-r--r--src/com/vaadin/data/util/HierarchicalContainer.java6
1 files changed, 5 insertions, 1 deletions
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);
}
/*