From 97ae8edfab96fd8ca3c670140caae373db30c39e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 14 May 2012 00:44:42 +0300
Subject: [PATCH] Fixed problem with iterator containing null (#8729)

---
 src/com/vaadin/ui/Root.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 07dd5a0f69..93b98693c2 100644
--- 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();
     }
 
-- 
2.39.5