From 0710b724cef0c0c543a48e1869dec87011269391 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Tue, 27 Nov 2007 14:48:23 +0000 Subject: [PATCH] Fixed NPE in filtering (property.toString() can be null) svn changeset:3003/svn branch:trunk --- src/com/itmill/toolkit/data/util/IndexedContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/data/util/IndexedContainer.java b/src/com/itmill/toolkit/data/util/IndexedContainer.java index 081385fc0c..00bd098548 100644 --- a/src/com/itmill/toolkit/data/util/IndexedContainer.java +++ b/src/com/itmill/toolkit/data/util/IndexedContainer.java @@ -1765,7 +1765,7 @@ public class IndexedContainer implements Container, Container.Indexed, String s1 = f.ignoreCase ? f.filterString.toLowerCase() : f.filterString; Property p = item.getItemProperty(f.propertyId); - if (p == null) { + if (p == null || p.toString() == null) { return false; } String s2 = f.ignoreCase ? p.toString().toLowerCase() : p -- 2.39.5