Fix for #3825 - AbstractComponentThrows NPE when both visible and enable is set to...

svn changeset:10289/svn branch:6.2

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 550ffbef0b2961ea416d1b5012903477e72d94a5..de1515d8560378823cc7e12e841eedf10b38f605 100644 (file)
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -368,7 +368,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource
             // is set visible again. This workaround is needed as isEnabled
             // checks isVisible.
             boolean needRepaint = (wasEnabledInContext != isEnabledInContext)
-                    || (wasEnabled != isEnabled && !parent.isVisible());
+                    || (wasEnabled != isEnabled && (getParent() == null || !getParent()
+                            .isVisible()));
 
             if (needRepaint) {
                 requestRepaint();