diff options
| author | Artur Signell <artur@vaadin.com> | 2013-01-30 13:17:48 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-01-30 13:17:48 +0200 |
| commit | af82e142c37e08bbda7e3869072460c92f1fb575 (patch) | |
| tree | 6d659c18cae1c8e3c3a8def1e1f40207d32599e5 /server/src/com/vaadin/data/util/IndexedContainer.java | |
| parent | e73643afce3045af0c1e21eac1415358936b3179 (diff) | |
| download | vaadin-framework-af82e142c37e08bbda7e3869072460c92f1fb575.tar.gz vaadin-framework-af82e142c37e08bbda7e3869072460c92f1fb575.zip | |
Do not throw NPE when asking for a null propertyId (#10445)
Change-Id: If788d84c66d640368989e443394505600ad12439
Diffstat (limited to 'server/src/com/vaadin/data/util/IndexedContainer.java')
| -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; } |