From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 13 Feb 2009 07:30:24 +0000 (+0000)
Subject: Fix for #2585 - NullPointerException when detaching an item in HierarchicalContainer
X-Git-Tag: 6.7.0.beta1~3164
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f7be9bb1724c848e285dc588557c89b7f3373fbf;p=vaadin-framework.git

Fix for #2585 - NullPointerException when detaching an item in HierarchicalContainer

svn changeset:6826/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
index c702c14795..ce46da362a 100644
--- a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
+++ b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
@@ -167,7 +167,7 @@ public class HierarchicalContainer extends IndexedContainer implements
 
         // Checks if no change is necessary
         if ((newParentId == null && oldParentId == null)
-                || newParentId.equals(oldParentId)) {
+                || ((newParentId != null) && newParentId.equals(oldParentId))) {
             return true;
         }