From a0fa67db10ce768d9a340814a4a26f5700b2bacb Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Mon, 16 Feb 2009 13:44:24 +0000 Subject: [PATCH] Tooltip timer could cause "NPE" in some instances. Probably cause for #2567 svn changeset:6855/svn branch:trunk --- .../terminal/gwt/client/ApplicationConnection.java | 10 +++++++++- .../itmill/toolkit/terminal/gwt/client/ITooltip.java | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index cb3fe85951..bc19ef7b62 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -1498,7 +1498,15 @@ public class ApplicationConnection { * */ public TooltipInfo getTitleInfo(Paintable titleOwner) { - return idToPaintableDetail.get(getPid(titleOwner)).getTooltipInfo(); + if (null == titleOwner) { + return null; + } + ComponentDetail pd = idToPaintableDetail.get(getPid(titleOwner)); + if (null != pd) { + return pd.getTooltipInfo(); + } else { + return null; + } } private final ITooltip tooltip = new ITooltip(this); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java b/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java index fe5b8b65ab..773e847aae 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java @@ -135,7 +135,9 @@ public class ITooltip extends IToolkitOverlay { @Override public void run() { TooltipInfo info = ac.getTitleInfo(tooltipOwner); - show(info); + if (null != info) { + show(info); + } opening = false; } }; -- 2.39.5