From f9af10668cb5d89d0913e7f0ad97f1b0e485dee9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 14 Dec 2009 15:27:46 +0000
Subject: [PATCH] Fix for #3825 - AbstractComponentThrows NPE when both visible
 and enable is set to false

svn changeset:10289/svn branch:6.2
---
 src/com/vaadin/ui/AbstractComponent.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 550ffbef0b..de1515d856 100644
--- 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();
-- 
2.39.5