summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-12-07 23:49:32 +0000
committerArtur Signell <artur.signell@itmill.com>2011-12-07 23:49:32 +0000
commit3c2b32e356cb74d972864d78fabe20a36f02a8ee (patch)
tree0317c1186281d9fba9bb423d50e8d55957748ebd /src
parent6a12737b955ef3761d3c5695a6c280976d12400a (diff)
downloadvaadin-framework-3c2b32e356cb74d972864d78fabe20a36f02a8ee.tar.gz
vaadin-framework-3c2b32e356cb74d972864d78fabe20a36f02a8ee.zip
#6603 AbstractBeanContainer.addAll does not ensure resolved itemIds are not null
svn changeset:22308/svn branch:6.7
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/data/util/AbstractBeanContainer.java5
1 files changed, 5 insertions, 0 deletions
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;
}