From 393b71266c8874b4aa6a13df1b2d2c5281831566 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 30 Dec 2015 07:49:10 +0200
Subject: Make GeneratedPropertyContainer.getItem(nonExistant) return null
 (#19425)

Change-Id: I41e40b87b64aec046428c1294aa1d488b6daf693
---
 server/src/com/vaadin/data/util/GeneratedPropertyContainer.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'server/src/com/vaadin/data')

diff --git a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
index fd2ce609b8..f50ff01fc6 100644
--- a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
@@ -550,6 +550,10 @@ public class GeneratedPropertyContainer extends AbstractContainer implements
     @Override
     public Item getItem(Object itemId) {
         Item item = wrappedContainer.getItem(itemId);
+        if (item == null) {
+            return null;
+        }
+
         return createGeneratedPropertyItem(itemId, item);
     }
 
-- 
cgit v1.2.3