summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-01-11 08:23:46 +0000
committerVaadin Code Review <review@vaadin.com>2013-01-11 08:23:46 +0000
commit99cbaa45fac4545cc9cd3fe7913f1fd391f30773 (patch)
tree5d196f0e4eddb33db2358b43dae9b0e966ff74ca /client
parent34efc3b975686749baab2667939250e68a17baca (diff)
parent05b3faab88f3cb22a1b024d9d7ecd12ce8bab1a1 (diff)
downloadvaadin-framework-99cbaa45fac4545cc9cd3fe7913f1fd391f30773.tar.gz
vaadin-framework-99cbaa45fac4545cc9cd3fe7913f1fd391f30773.zip
Merge "Fixed NPE in Table tooltip handling (#10705)"
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index cd89d9eb6a..e2f5e9b57d 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -4985,7 +4985,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
TooltipInfo info = null;
final Element targetTdOrTr = getTdOrTr((Element) target.cast());
- if ("td".equals(targetTdOrTr.getTagName().toLowerCase())) {
+ if (targetTdOrTr != null
+ && "td".equals(targetTdOrTr.getTagName().toLowerCase())) {
TableCellElement td = (TableCellElement) targetTdOrTr
.cast();
info = cellToolTips.get(td);