Fixed problem with iterator containing null (#8729)

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 07dd5a0f69a76345a6b1789847cbc95acfd1875a..93b98693c2c4f2aed8a19f45ba4d14b7f2c43ea4 100644 (file)
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -643,6 +643,10 @@ public abstract class Root extends AbstractComponentContainer implements
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator<Component> getComponentIterator() {
+        if (getContent() == null) {
+            return Collections.EMPTY_LIST.iterator();
+        }
+
         return Collections.singleton((Component) getContent()).iterator();
     }