diff options
| author | Artur Signell <artur@vaadin.com> | 2016-03-13 13:27:38 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-04-20 12:14:58 +0000 |
| commit | fe530b84f06f4103a6499a13ac7c66cdb3c3cfd9 (patch) | |
| tree | aaf5ed5a4a071ed4dcc346f8304228c11b550a7e /server | |
| parent | 9ac0f05066dad8beecf12a8e663b13b93cece140 (diff) | |
| download | vaadin-framework-fe530b84f06f4103a6499a13ac7c66cdb3c3cfd9.tar.gz vaadin-framework-fe530b84f06f4103a6499a13ac7c66cdb3c3cfd9.zip | |
Ensure getItemProperty returns null for unknown property ids (#7103)
Change-Id: I77e826f81f2469badf35462ba40f0e8d73e48245
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/data/util/IndexedContainer.java | 4 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java index b851baf674..8783c061ac 100644 --- a/server/src/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/com/vaadin/data/util/IndexedContainer.java @@ -741,6 +741,10 @@ public class IndexedContainer extends */ @Override public Property getItemProperty(Object id) { + if (!propertyIds.contains(id)) { + return null; + } + return new IndexedContainerProperty(itemId, id); } diff --git a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java index 52acc5ab76..5fd4f8ae17 100644 --- a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java +++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java @@ -149,6 +149,10 @@ public abstract class AbstractContainerTestBase extends TestCase { } + // getItemProperty + Assert.assertNull(container.getItem(itemIdInSet).getItemProperty( + "notinset")); + } protected static final Object FULLY_QUALIFIED_NAME = "fullyQualifiedName"; |