Fix for #3449 - Adding and removing a IndexedContainer property with null as default...

svn changeset:9022/svn branch:6.1

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index b7c6463988234a108d4b2df5f8da3607b9285d6f..fc7ea1605424f4e259ff62677d221b2813550d48 100644 (file)
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -398,7 +398,9 @@ public class IndexedContainer implements Container.Indexed,
         // Removes the Property to Property list and types
         propertyIds.remove(propertyId);
         types.remove(propertyId);
-        defaultPropertyValues.remove(propertyId);
+        if (defaultPropertyValues != null) {
+            defaultPropertyValues.remove(propertyId);
+        }
 
         // If remove the Property from all Items
         for (final Iterator i = itemIds.iterator(); i.hasNext();) {