#6527 Container refactoring: fix bug when no item passes filter

svn changeset:17648/svn branch:6.6

diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index 2ac1052afb7cac047b74e32458be4cc21debe27f..61dbe75849d9214208b72b3f5870cfefeb392948 100644 (file)
--- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -266,8 +266,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
         // Reset filtered list
         List<ITEMIDTYPE> originalFilteredItemIds = getFilteredItemIds();
+        boolean wasUnfiltered = false;
         if (originalFilteredItemIds == null) {
             originalFilteredItemIds = Collections.emptyList();
+            wasUnfiltered = true;
         }
         setFilteredItemIds(new ListSet<ITEMIDTYPE>());
 
@@ -284,7 +286,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
             }
         }
 
-        return !equal || origIt.hasNext();
+        return wasUnfiltered || !equal || origIt.hasNext();
     }
 
     /**