diff options
| -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"; |