From fe530b84f06f4103a6499a13ac7c66cdb3c3cfd9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sun, 13 Mar 2016 13:27:38 +0200
Subject: Ensure getItemProperty returns null for unknown property ids (#7103)

Change-Id: I77e826f81f2469badf35462ba40f0e8d73e48245
---
 server/src/com/vaadin/data/util/IndexedContainer.java                | 4 ++++
 server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'server')

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";
-- 
cgit v1.2.3