From 024c77df43bd76534f4ab00a1b0893b147ca23ec Mon Sep 17 00:00:00 2001
From: John Alhroos <john.ahlroos@itmill.com>
Date: Mon, 21 Jun 2010 10:30:04 +0000
Subject: [PATCH] Fix for #5008

svn changeset:13807/svn branch:6.4
---
 src/com/vaadin/terminal/gwt/client/ui/VTree.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index 22d10f13c9..d198a3b2c9 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -252,7 +252,8 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
 
         selectedIds = uidl.getStringArrayVariableAsSet("selected");
 
-        if (lastSelection == null && focusedNode == null) {
+        if (lastSelection == null && focusedNode == null
+                && !selectedIds.isEmpty()) {
             setFocusedNode(keyToNode.get(selectedIds.iterator().next()));
             focusedNode.setFocused(false);
         }
-- 
2.39.5