summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2010-04-07 11:50:33 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2010-04-07 11:50:33 +0000
commitbeecdae860a930ae49df04f48a784894ffbe5431 (patch)
treee79e01bd5dc3f5637cfdb36991dfcd5e5116c578 /src
parentf2f60e291453b3851a77a76510a8fd2501dec6d6 (diff)
downloadvaadin-framework-beecdae860a930ae49df04f48a784894ffbe5431.tar.gz
vaadin-framework-beecdae860a930ae49df04f48a784894ffbe5431.zip
added null check
svn changeset:12356/svn branch:6.3
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VTree.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index 2272401a74..42421b80de 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -439,7 +439,7 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
final int type = DOM.eventGetType(event);
final Element target = DOM.eventGetTarget(event);
final boolean inCaption = target == nodeCaptionSpan
- || target == icon.getElement();
+ || (icon != null && target == icon.getElement());
if (inCaption
&& client
.hasEventListeners(VTree.this, ITEM_CLICK_EVENT_ID)