From 7008425711a72315859c08082f5f8f58ee3bf06c Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 2 Oct 2009 05:23:37 +0000 Subject: [PATCH] Fix for #3449 - Adding and removing a IndexedContainer property with null as default value causes NPE svn changeset:9022/svn branch:6.1 --- src/com/vaadin/data/util/IndexedContainer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java index b7c6463988..fc7ea16054 100644 --- 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();) { -- 2.39.5