From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 26 Nov 2009 13:04:09 +0000 (+0000)
Subject: added null check
X-Git-Tag: 6.7.0.beta1~2237
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=459cd623c8fe7c7e5b95a8ddbd0fe7ea1f2afbf6;p=vaadin-framework.git

added null check

svn changeset:10074/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index ba57956c27..72d29071cd 100644
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -52,7 +52,9 @@ public class VCaption extends HTML {
         this.client = client;
         owner = component;
 
-        setOwnerPid(getElement(), client.getPid(owner));
+        if (client != null && owner != null) {
+            setOwnerPid(getElement(), client.getPid(owner));
+        }
 
         setStyleName(CLASSNAME);
         sinkEvents(VTooltip.TOOLTIP_EVENTS);