From 3c2b32e356cb74d972864d78fabe20a36f02a8ee Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 7 Dec 2011 23:49:32 +0000
Subject: [PATCH] #6603 AbstractBeanContainer.addAll does not ensure resolved
 itemIds are not null

svn changeset:22308/svn branch:6.7
---
 src/com/vaadin/data/util/AbstractBeanContainer.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/src/com/vaadin/data/util/AbstractBeanContainer.java
index b1d0b0672b..1b297d6a88 100644
--- a/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -637,6 +637,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
                 continue;
             }
             IDTYPE itemId = resolveBeanId(bean);
+            if (itemId == null) {
+                throw new IllegalArgumentException(
+                        "Resolved identifier for a bean must not be null");
+            }
+
             if (internalAddItemAtEnd(itemId, createBeanItem(bean), false) != null) {
                 modified = true;
             }
-- 
2.39.5