NPE fix for getIcon()

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 5d0574b08e3636a0e93c3d58268c56a216e8f9f4..5791ff21cd46be52a35c1b9a4b21f8e01dc55a60 100644 (file)
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -334,7 +334,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * use the default documentation from implemented interface.
      */
     public Resource getIcon() {
-        return ((ResourceReference) getState().getIcon()).getResource();
+        ResourceReference ref = ((ResourceReference) getState().getIcon());
+        if (ref == null) {
+            return null;
+        } else {
+            return ref.getResource();
+        }
     }
 
     /**