From beecdae860a930ae49df04f48a784894ffbe5431 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 7 Apr 2010 11:50:33 +0000
Subject: added null check

svn changeset:12356/svn branch:6.3
---
 src/com/vaadin/terminal/gwt/client/ui/VTree.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com')

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)
-- 
cgit v1.2.3