From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 8 Feb 2012 07:06:15 +0000 (+0200)
Subject: getParent() shouldn't throw npe when widget's parent is null (#8323)
X-Git-Tag: 7.0.0.alpha2~454
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2bb7aae1c0cd44ad1ca260dec70b3225c8a226ac;p=vaadin-framework.git

getParent() shouldn't throw npe when widget's parent is null (#8323)
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
index efe6896e9b..355516ccd1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
@@ -94,15 +94,15 @@ public abstract class VAbstractPaintableWidget implements VPaintableWidget {
         VPaintableMap paintableMap = VPaintableMap.get(getConnection());
 
         Widget w = getWidgetForPaintable();
-        while (w != null) {
+        while (true) {
             w = w.getParent();
+            if (w == null) {
+                return null;
+            }
             if (paintableMap.isPaintable(w)) {
-                return (VPaintableWidgetContainer) paintableMap
-                        .getPaintable(w);
+                return (VPaintableWidgetContainer) paintableMap.getPaintable(w);
             }
         }
-
-        return null;
     }
 
     protected static boolean isRealUpdate(UIDL uidl) {