diff options
| author | Marc Englund <marc.englund@itmill.com> | 2007-11-27 14:48:23 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2007-11-27 14:48:23 +0000 |
| commit | 0710b724cef0c0c543a48e1869dec87011269391 (patch) | |
| tree | c59622f469781c3260ddaa69a0d6fe39b23bf94f | |
| parent | 35fddf0c349af28af59091cd629dc86d81aea44d (diff) | |
| download | vaadin-framework-0710b724cef0c0c543a48e1869dec87011269391.tar.gz vaadin-framework-0710b724cef0c0c543a48e1869dec87011269391.zip | |
Fixed NPE in filtering (property.toString() can be null)
svn changeset:3003/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/data/util/IndexedContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 |