From 49c7751a90fd58fc6c292caa1f8f33527ea983de Mon Sep 17 00:00:00 2001 From: Henri Sara <henri.sara@itmill.com> Date: Tue, 8 Mar 2011 07:27:50 +0000 Subject: #6527 Container refactoring: improved bug fix when no item passes filter svn changeset:17649/svn branch:6.6 --- src/com/vaadin/data/util/AbstractInMemoryContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/com/vaadin/data/util') diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java index 61dbe75849..e9867c16ae 100644 --- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -286,7 +286,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } - return wasUnfiltered || !equal || origIt.hasNext(); + return (wasUnfiltered && !getAllItemIds().isEmpty()) || !equal + || origIt.hasNext(); } /** -- cgit v1.2.3