From af82e142c37e08bbda7e3869072460c92f1fb575 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 30 Jan 2013 13:17:48 +0200 Subject: Do not throw NPE when asking for a null propertyId (#10445) Change-Id: If788d84c66d640368989e443394505600ad12439 --- server/src/com/vaadin/data/util/IndexedContainer.java | 3 ++- server/tests/src/com/vaadin/data/util/TestIndexedContainer.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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; } diff --git a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java index 971cdb5f62..09e5a26c15 100644 --- a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java +++ b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java @@ -384,4 +384,12 @@ public class TestIndexedContainer extends AbstractInMemoryContainerTest { assertNull(ic.getContainerProperty(object1, "xyz")); } + // test getting null property id (#10445) + public void testNullPropertyId() { + IndexedContainer ic = new IndexedContainer(); + String object1 = new String("Obj1"); + ic.addItem(object1); + assertNull(ic.getContainerProperty(object1, null)); + } + } -- cgit v1.2.3