1 files changed, 6 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/CustomField.java b/server/src/com/vaadin/ui/CustomField.java
index e782bd1783..67695fe54b 100644
--- a/server/src/com/vaadin/ui/CustomField.java
+++ b/server/src/com/vaadin/ui/CustomField.java
@@ -146,14 +146,17 @@ public abstract class CustomField<T> extends AbstractField<T> implements
         }
     }
 
-    @Override
+    /**
+     * @deprecated As of 7.0, use {@link #iterator()} instead.
+     */
+    @Deprecated
     public Iterator<Component> getComponentIterator() {
-        return new ComponentIterator();
+        return iterator();
     }
 
     @Override
     public Iterator<Component> iterator() {
-        return getComponentIterator();
+        return new ComponentIterator();
     }
 
     @Override