aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/data/util/AbstractInMemoryContainer.java
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-03-08 07:25:00 +0000
committerHenri Sara <henri.sara@itmill.com>2011-03-08 07:25:00 +0000
commitac0da5404b4562c7f16eadec61ae52f22cc70fe2 (patch)
treedbb8d01759899c15158844b52a32ac952ee6a8b9 /src/com/vaadin/data/util/AbstractInMemoryContainer.java
parentd08aede53e72e64235d127093cb91640106e48b9 (diff)
downloadvaadin-framework-ac0da5404b4562c7f16eadec61ae52f22cc70fe2.tar.gz
vaadin-framework-ac0da5404b4562c7f16eadec61ae52f22cc70fe2.zip
#6527 Container refactoring: fix bug when no item passes filter
svn changeset:17648/svn branch:6.6
Diffstat (limited to 'src/com/vaadin/data/util/AbstractInMemoryContainer.java')
-rw-r--r--src/com/vaadin/data/util/AbstractInMemoryContainer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index 2ac1052afb..61dbe75849 100644
--- 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();
}
/**