From 84099ee2b8363c12a813157f9752981add5db113 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 30 Nov 2012 14:49:04 +0200 Subject: Return null as non-existing property for IndexedContainer (#10445) Change-Id: I9829173dda84d5f496114b7d08204648bf86fc77 --- server/src/com/vaadin/data/util/IndexedContainer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'server/src/com/vaadin/data') 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; } -- cgit v1.2.3