summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/data
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-12-30 07:49:10 +0200
committerVaadin Code Review <review@vaadin.com>2016-01-04 08:50:26 +0000
commit393b71266c8874b4aa6a13df1b2d2c5281831566 (patch)
treee7af88194a1488041a1145fb7aefe0632bcde0bb /server/src/com/vaadin/data
parent750a3ce93862fbe4c12c612555ce9082c4d638b7 (diff)
downloadvaadin-framework-393b71266c8874b4aa6a13df1b2d2c5281831566.tar.gz
vaadin-framework-393b71266c8874b4aa6a13df1b2d2c5281831566.zip
Make GeneratedPropertyContainer.getItem(nonExistant) return null (#19425)
Change-Id: I41e40b87b64aec046428c1294aa1d488b6daf693
Diffstat (limited to 'server/src/com/vaadin/data')
-rw-r--r--server/src/com/vaadin/data/util/GeneratedPropertyContainer.java4
1 files changed, 4 insertions, 0 deletions
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);
}