Fixed NPE in filtering (property.toString() can be null)

svn changeset:3003/svn branch:trunk

diff --git a/src/com/itmill/toolkit/data/util/IndexedContainer.java b/src/com/itmill/toolkit/data/util/IndexedContainer.java
index 081385fc0c1864b525e26a3bc95e33b4875cd9ca..00bd0985485b8ec04fd4c280831a8e0f2871568d 100644 (file)
--- 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