Merged fixes from 6.7

svn changeset:22331/svn branch:6.8

2 files changed, 6 insertions, 3 deletions

diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/src/com/vaadin/data/util/AbstractBeanContainer.java
index 0e4feaab32..6260e05518 100644
--- a/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -626,9 +626,12 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
      *            The collection of beans to add. Must not be null.
      * @throws IllegalStateException
      *             if no bean identifier resolver has been set
+     * @throws IllegalArgumentException
+     *             if the resolver returns a null itemId for one of the beans in
+     *             the collection
      */
     protected void addAll(Collection<? extends BEANTYPE> collection)
-            throws IllegalStateException {
+            throws IllegalStateException, IllegalArgumentException {
         boolean modified = false;
         for (BEANTYPE bean : collection) {
             // TODO skipping invalid beans - should not allow them in javadoc?
diff --git a/src/com/vaadin/tools/ReflectTools.java b/src/com/vaadin/tools/ReflectTools.java
index 2fc2125842..9f0667f90e 100644
--- a/src/com/vaadin/tools/ReflectTools.java
+++ b/src/com/vaadin/tools/ReflectTools.java
@@ -15,8 +15,8 @@ import java.lang.reflect.Method;
 public class ReflectTools {
     /**
      * Locates the method in the given class. Returns null if the method is not
-     * found. This method never throws exceptions. Errors in locating methods
-     * are considered serious problems and are output to standard error.
+     * found. Throws an ExceptionInInitializerError if there is a problem
+     * locating the method as this is mainly called from static blocks.
      * 
      * @param cls
      *            Class that contains the method