diff options
| author | Henri Sara <hesara@vaadin.com> | 2013-02-08 07:52:59 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-02-08 07:52:59 +0000 |
| commit | 12996f599cf5284b4c2994764e26e700011e1a64 (patch) | |
| tree | 3184f7eac6e7cdb1fafc332cbe9819a125a296b8 /server/src | |
| parent | 6e6855ec13af4f6a59a0f47410caa32f0b528777 (diff) | |
| parent | af82e142c37e08bbda7e3869072460c92f1fb575 (diff) | |
| download | vaadin-framework-12996f599cf5284b4c2994764e26e700011e1a64.tar.gz vaadin-framework-12996f599cf5284b4c2994764e26e700011e1a64.zip | |
Merge "Do not throw NPE when asking for a null propertyId (#10445)"
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/data/util/IndexedContainer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java index 1705365f60..306f9cf23b 100644 --- a/server/src/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/com/vaadin/data/util/IndexedContainer.java @@ -166,7 +166,8 @@ public class IndexedContainer extends public Property getContainerProperty(Object itemId, Object propertyId) { // map lookup more efficient than propertyIds if there are many // properties - if (!containsId(itemId) || !types.containsKey(propertyId)) { + if (!containsId(itemId) || propertyId == null + || !types.containsKey(propertyId)) { return null; } |