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 c702c14795db546bafbab505421ab020088630df..ce46da362a5fd14810e1237385b557aa761ffbfe 100644 (file)
--- 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;
         }