From 4583d07cd7094e2b987df6350b4b19eb4c01c210 Mon Sep 17 00:00:00 2001 From: Patrik Lindström Date: Fri, 28 Jun 2013 14:56:21 +0300 Subject: Fix NPE in Like.java (#10167) Change-Id: I041fbc5c3cda08d3cf3453cefc5f044c63dbe9bb --- server/src/com/vaadin/data/util/filter/Like.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'server/src') diff --git a/server/src/com/vaadin/data/util/filter/Like.java b/server/src/com/vaadin/data/util/filter/Like.java index 91230bb1f1..4c15564105 100644 --- a/server/src/com/vaadin/data/util/filter/Like.java +++ b/server/src/com/vaadin/data/util/filter/Like.java @@ -60,6 +60,11 @@ public class Like implements Filter { String colValue = (String) item.getItemProperty(getPropertyId()) .getValue(); + // Fix issue #10167 - avoid NPE and drop null property values + if (colValue == null) { + return false; + } + String pattern = getValue().replace("%", ".*"); if (isCaseSensitive()) { return colValue.matches(pattern); -- cgit v1.2.3