summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/data/util
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-03-08 07:27:50 +0000
committerHenri Sara <henri.sara@itmill.com>2011-03-08 07:27:50 +0000
commit49c7751a90fd58fc6c292caa1f8f33527ea983de (patch)
treef720ae2a4be391028490771ce90c8030db6edd8a /src/com/vaadin/data/util
parentac0da5404b4562c7f16eadec61ae52f22cc70fe2 (diff)
downloadvaadin-framework-49c7751a90fd58fc6c292caa1f8f33527ea983de.tar.gz
vaadin-framework-49c7751a90fd58fc6c292caa1f8f33527ea983de.zip
#6527 Container refactoring: improved bug fix when no item passes filter
svn changeset:17649/svn branch:6.6
Diffstat (limited to 'src/com/vaadin/data/util')
-rw-r--r--src/com/vaadin/data/util/AbstractInMemoryContainer.java3
1 files changed, 2 insertions, 1 deletions
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();
}
/**