From 58bcba80f3399851fa2f77b876a78e32fccccea5 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 17 Mar 2010 11:02:57 +0000
Subject: [PATCH] #4360 HierarchicalContainer.setParent() left container in
 inconsistent state

svn changeset:11925/svn branch:6.3
---
 src/com/vaadin/data/util/HierarchicalContainer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index 152d9b4e58..9d9b375fd6 100644
--- a/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -238,7 +238,7 @@ public class HierarchicalContainer extends IndexedContainer implements
             // roots)
 
             // Removes from old parents children list
-            final LinkedList<Object> l = children.get(itemId);
+            final LinkedList<Object> l = children.get(oldParentId);
             if (l != null) {
                 l.remove(itemId);
                 if (l.isEmpty()) {
@@ -329,7 +329,8 @@ public class HierarchicalContainer extends IndexedContainer implements
     }
 
     /**
-     * TODO javadoc
+     * Moves a node in the container immediately after a sibling node. The two
+     * nodes must have the same parent in the container.
      * 
      * @param itemId
      * @param siblingId
-- 
2.39.5