summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/data
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/data')
-rw-r--r--server/src/com/vaadin/data/util/IndexedContainer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 81ee4ae2a0..aeb0ca96eb 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -164,7 +164,9 @@ public class IndexedContainer extends
*/
@Override
public Property getContainerProperty(Object itemId, Object propertyId) {
- if (!containsId(itemId)) {
+ // map lookup more efficient than propertyIds if there are many
+ // properties
+ if (!containsId(itemId) || !types.containsKey(propertyId)) {
return null;
}